From d8782e732928cebcf0a6ae09527d06391b22f55b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 三月 2024 10:01:21 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/basicInfo/ParamDataExpect.vue | 4 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataExpectController.java | 59 ++++++++++++-----------------
2 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataExpectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataExpectController.java
index 91f1eba..c5059f5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataExpectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataExpectController.java
@@ -30,12 +30,12 @@
/**
* param_data_expect
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-03-04
*/
@RestController
@RequestMapping("/basicInfo/ParamDataExpect/")
-@Api(tags="param_data_expect")
+@Api(tags = "param_data_expect")
public class ParamDataExpectController {
@Autowired
private ParamDataExpectService paramDataExpectService;
@@ -43,56 +43,47 @@
@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 = "srcId", value = "涓婄骇ID", dataType = Constant.QT.STRING)})
- public PageResult<ParamDataExpect> 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 = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
+ @ApiImplicitParam(name = "nodeType", value = "绫诲瀷", dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "srcId", value = "涓婄骇ID", dataType = Constant.QT.STRING)})
+ public PageResult<ParamDataExpect> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(paramDataExpectService.page(queryFilter));
}
@PostMapping("get")
- public Result getSelect(@RequestBody List<ParamDataExpect> list){
- for(ParamDataExpect ParamDataExpect:list){
+ public Result getSelect(@RequestBody List<ParamDataExpect> list) {
+ for (ParamDataExpect ParamDataExpect : list) {
ParamDataExpect.setProductId(ParamDataExpect.getId());
ParamDataExpect.setId(null);
- this.insert(ParamDataExpect);
+ paramDataExpectService.insert(ParamDataExpect);
}
return Result.ok();
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<ParamDataExpect> get(@PathVariable("id") Long id){
+ public Result<ParamDataExpect> get(@PathVariable("id") Long id) {
ParamDataExpect data = paramDataExpectService.get(id);
return Result.ok(data);
}
- @PostMapping
- @ApiOperation("鏂板")
- @LogOperation("鏂板")
- public Result insert(@RequestBody ParamDataExpect paramDataExpect){
+ @PostMapping("save")
+ public Result save(@RequestBody ParamDataExpect paramDataExpect) {
//鏁堥獙鏁版嵁
-
- ValidatorUtils.validateEntity(paramDataExpect, AddGroup.class, DefaultGroup.class);
- paramDataExpectService.insert(paramDataExpect);
-
- return Result.ok();
- }
-
- @PutMapping
- @ApiOperation("淇敼")
- @LogOperation("淇敼")
- public Result update(@RequestBody ParamDataExpect paramDataExpect){
- //鏁堥獙鏁版嵁
- for (ParamDataExpect expect:paramDataExpect.getDataThreeList()){
- ValidatorUtils.validateEntity(expect, UpdateGroup.class, DefaultGroup.class);
- paramDataExpectService.update(expect);
+ for (ParamDataExpect expect : paramDataExpect.getDataThreeList()) {
+ if (expect.getId()!=null){
+ ValidatorUtils.validateEntity(expect, UpdateGroup.class, DefaultGroup.class);
+ paramDataExpectService.update(expect);
+ }else{
+ ValidatorUtils.validateEntity(expect, AddGroup.class, DefaultGroup.class);
+ paramDataExpectService.insert(expect);
+ }
}
return Result.ok();
}
@@ -100,7 +91,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
paramDataExpectService.delete(ids);
diff --git a/web/src/views/modules/basicInfo/ParamDataExpect.vue b/web/src/views/modules/basicInfo/ParamDataExpect.vue
index 557f4a0..371f0a8 100644
--- a/web/src/views/modules/basicInfo/ParamDataExpect.vue
+++ b/web/src/views/modules/basicInfo/ParamDataExpect.vue
@@ -200,7 +200,7 @@
<!-- <zt-table-column-dict v-if="dataForm.nodeType==='2'" :key="27" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�"
width="160"/>-->
- <el-table-column prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�" :key="27" width="160">
+ <el-table-column v-if="dataForm.nodeType==='2'" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�" :key="27" width="160">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.reliabDistribType"
placeholder="褰撳墠鐘舵��">
@@ -314,7 +314,7 @@
async handleSaveRows() {
this.dataForm.dataThreeList = this.$refs.tableObj.dataList
console.log(this.dataForm, 'this.dataForm this.dataForm')
- let res = await this.$http.post('/basicInfo/ParamDataExpect/', this.dataForm)
+ let res = await this.$http.post('/basicInfo/ParamDataExpect/save', this.dataForm)
if (res.success) {
console.log(res.data)
await this.$tip.success()
--
Gitblit v1.9.1