From da4cb0bcbb9c35105afe449b31b3e2b03828d5d2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 11:32:29 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index f643f0d..a7c32a7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -36,12 +36,12 @@
/**
* test_check_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-05
*/
@RestController
@RequestMapping("/testCheckOrder/TestCheckOrder/")
-@Api(tags="test_check_order")
+@Api(tags = "test_check_order")
public class TestCheckOrderController {
@Autowired
private TestCheckOrderService testCheckOrderService;
@@ -52,33 +52,34 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"), @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK") })
- public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
-
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
+ @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK")})
+ public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(testCheckOrderService.page(queryFilter));
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<CheckOrderDto> getDto(Long checkId, Long projectId,String itemType) {
- CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId,itemType);
+ public Result<CheckOrderDto> getDto(Long checkId, Long projectId, String pageCode) {
+ CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId, pageCode);
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody CheckOrderDto checkOrderDto){
+ public Result insert(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, AddGroup.class, DefaultGroup.class);
- Map<String, String> map = new HashMap<>();
- map.put("funCode", "test_check_order");
- map.put("projectId",checkOrderDto.getProjectId().toString());
- checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
+/* Map<String, String> map = new HashMap<>();
+ String pagecode = checkOrderDto.getPageCode();
+ map.put("funCode", "test_check_order_"+pagecode);
+ map.put("projectId", checkOrderDto.getProjectId().toString());
+ checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));*/
Boolean result = testCheckOrderService.save(checkOrderDto);
return Result.ok();
}
@@ -86,7 +87,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody CheckOrderDto checkOrderDto){
+ public Result update(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, UpdateGroup.class, DefaultGroup.class);
Boolean result = testCheckOrderService.save(checkOrderDto);
@@ -97,7 +98,7 @@
@DeleteMapping("deleteCheckOrder")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
testCheckOrderService.delete(ids);
--
Gitblit v1.9.1