From 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
index 81e35c6..4a5d971 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
@@ -25,7 +25,7 @@
/**
- * param_data_expect
+ * param_data
*
* @author zt generator
* @since 1.0.0 2024-03-04
@@ -42,9 +42,12 @@
@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 = "reliabDistribType", value = "鍙潬鎬у垎甯�", dataType = Constant.QT.STRING, format = "reliab_distrib_type^EQ"),
+ @ApiImplicitParam(name = "repairDistribType", value = "缁翠慨鍒嗗竷", dataType = Constant.QT.STRING, format = "repair_distrib_type^EQ"),
+ @ApiImplicitParam(name = "repairable", value = "鍙淮淇�", dataType = Constant.QT.STRING, format = "repairable^EQ"),
+ @ApiImplicitParam(name = "basicJoinCompute", value = "鍙備笌璁＄畻", dataType = Constant.QT.STRING, format = "basic_join_compute^EQ"),
@ApiImplicitParam(name = "nodeType", value = "绫诲瀷", dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "srcId", value = "涓婄骇ID", dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "pageCode", value = "", dataType = Constant.QT.STRING)})
+ @ApiImplicitParam(name = "srcId", value = "涓婄骇ID", dataType = Constant.QT.STRING)})
public Result<List<ParamData>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return Result.ok(paramDataService.page(queryFilter));
@@ -71,12 +74,11 @@
@PostMapping("save")
public Result save(@RequestBody ParamData paramData) {
//鏁堥獙鏁版嵁
- for (ParamData expect : paramData.getDataThreeList()) {
- if (expect.getId()!=null){
- paramDataService.update(expect);
+ for (ParamData data : paramData.getDataThreeList()) {
+ if (data.getId()!=null){
+ paramDataService.update(data);
}else{
- expect.setPageCode(paramData.getPageCode());
- paramDataService.insert(expect);
+ paramDataService.insert(data);
}
}
return Result.ok();
--
Gitblit v1.9.1