From 57df7097f99ffe16a4b81876f23aebf38b637ec5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 11:24:15 +0800
Subject: [PATCH] art: 技术状态变更申请-验收接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
index 81dc19e..28d78bb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
@@ -11,15 +11,13 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.TechnicalStatusChangeOrderStatusEnum;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
+import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
/**
* @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇�
@@ -41,15 +39,13 @@
* @param query
* @param pageNo
* @param pageSize
- * @param req
* @return
*/
@ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<?> queryPageList(EamTechnicalStatusChangeQuery query,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Page<EamTechnicalStatusChange> page = new Page<EamTechnicalStatusChange>(pageNo, pageSize);
IPage<EamTechnicalStatusChange> pageList = eamTechnicalStatusChangeService.queryPageList(page, query);
return Result.OK(pageList);
@@ -117,7 +113,7 @@
if (entity == null) {
return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if (!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+ if (!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
}
entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.ABOLISH.name());
@@ -157,4 +153,22 @@
return Result.OK(eamTechnicalStatusChange);
}
+ /**
+ * 楠屾敹
+ * @param request
+ * @return
+ */
+ @ApiOperation(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-楠屾敹", notes = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-楠屾敹")
+ @PostMapping(value = "/acceptance")
+ public Result<?> acceptance(@RequestBody EamTechnicalStatusChangeDetail request) {
+ if (request == null) {
+ return Result.error("楠屾敹缁撴灉瀵硅薄涓嶈兘涓虹┖锛�");
+ }
+ boolean b = eamTechnicalStatusChangeService.acceptance(request);
+ if (!b) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛锛�");
+ }
+
}
--
Gitblit v1.9.3