From 6d41203724ed358d0a4a356a393ab673a82c6df6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 三月 2024 11:43:33 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataAssignController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataAssignController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataAssignController.java
index b5ae346..e8a2496 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataAssignController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataAssignController.java
@@ -43,17 +43,15 @@
@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 = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
@ApiImplicitParam(name = "nodeType", value = "绫诲瀷", dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "id", value = "涓婄骇ID", dataType = Constant.QT.STRING)
+ @ApiImplicitParam(name = "srcId", value = "ID", dataType = Constant.QT.STRING)
})
- public PageResult<ParamDataAssign> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ public Result<List<ParamDataAssign>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(paramDataAssignService.page(queryFilter));
+ return Result.ok(paramDataAssignService.page(queryFilter));
}
@PostMapping("get")
@@ -61,7 +59,7 @@
for(ParamDataAssign assign:list){
assign.setProductId(assign.getId());
assign.setId(null);
- this.insert(assign);
+ paramDataAssignService.insert(assign);
}
return Result.ok();
}
@@ -74,14 +72,18 @@
return Result.ok(data);
}
- @PostMapping
- @ApiOperation("鏂板")
- @LogOperation("鏂板")
- public Result insert(@RequestBody ParamDataAssign paramDataAssign){
+ @PostMapping("save")
+ public Result save(@RequestBody ParamDataAssign paramDataAssign) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(paramDataAssign, AddGroup.class, DefaultGroup.class);
- paramDataAssignService.insert(paramDataAssign);
-
+ for (ParamDataAssign assign : paramDataAssign.getDataThreeList()) {
+ if (assign.getId()!=null){
+ ValidatorUtils.validateEntity(assign, UpdateGroup.class, DefaultGroup.class);
+ paramDataAssignService.update(assign);
+ }else{
+ ValidatorUtils.validateEntity(assign, AddGroup.class, DefaultGroup.class);
+ paramDataAssignService.insert(assign);
+ }
+ }
return Result.ok();
}
--
Gitblit v1.9.1