From 7d5d6d104b0ad994b62b53683d752b4fec61b8c1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 21:13:29 +0800
Subject: [PATCH] art: 技术状态鉴定工单-字段转译
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
index fe8cd09..2433a2a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +12,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +39,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamTechnicalStatusEvaluationOrderChange
+ * @param query
* @param pageNo
* @param pageSize
* @param req
@@ -45,41 +47,52 @@
*/
@ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange,
+ public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChangeQuery query,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderChange, req.getParameterMap());
Page<EamTechnicalStatusEvaluationOrderChange> page = new Page<EamTechnicalStatusEvaluationOrderChange>(pageNo, pageSize);
- IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.page(page, queryWrapper);
+ IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.queryPageList(page, query);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamTechnicalStatusEvaluationOrderChange
+ * @param request
* @return
*/
@AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞")
@ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) {
- eamTechnicalStatusEvaluationOrderChangeService.save(eamTechnicalStatusEvaluationOrderChange);
+ public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderChange request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamTechnicalStatusEvaluationOrderChangeService.addTechnicalStatusEvaluationOrderChange(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param eamTechnicalStatusEvaluationOrderChange
+ * @param request
* @return
*/
@AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫")
@ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) {
- eamTechnicalStatusEvaluationOrderChangeService.updateById(eamTechnicalStatusEvaluationOrderChange);
+ public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderChange request) {
+ if (request == null) {
+ return Result.error("缂栬緫鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamTechnicalStatusEvaluationOrderChangeService.editTechnicalStatusEvaluationOrderChange(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
--
Gitblit v1.9.3