From 3bc2339aa32cb6c3704bdb3a244c99b8d93ff39d Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 08 七月 2025 09:15:46 +0800 Subject: [PATCH] art:技术状态鉴定规范-相关接口提交 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 64 ++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java index 3697fa0..56009c2 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java @@ -8,8 +8,11 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.eam.constant.BusinessCodeConst; +import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum; +import org.jeecg.modules.eam.entity.EamMaintenanceStandard; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService; @@ -19,7 +22,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; /** * @Description: 鎶�鏈姸鎬侀壌瀹氳鑼� @@ -71,7 +73,7 @@ if (CollectionUtil.isEmpty(request.getTableDetailList())) { return Result.error("妫�鏌ラ」涓嶈兘涓虹┖锛�"); } - String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE); + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); request.setStandardCode(codeSeq); boolean b = eamTechnicalStatusEvaluationStandardService.addEamTechnicalStatusEvaluationStandard(request); if (!b) { @@ -104,31 +106,28 @@ } /** - * 閫氳繃id鍒犻櫎 + * 鍗囩増 * - * @param id + * @param request * @return */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-閫氳繃id鍒犻櫎") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-閫氳繃id鍒犻櫎", notes = "鎶�鏈姸鎬侀壌瀹氳鑼�-閫氳繃id鍒犻櫎") - @DeleteMapping(value = "/delete") - public Result<?> delete(@RequestParam(name = "id", required = true) String id) { - eamTechnicalStatusEvaluationStandardService.removeById(id); - return Result.OK("鍒犻櫎鎴愬姛!"); - } - - /** - * 鎵归噺鍒犻櫎 - * - * @param ids - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎵归噺鍒犻櫎") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎵归噺鍒犻櫎", notes = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎵归噺鍒犻櫎") - @DeleteMapping(value = "/deleteBatch") - public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.eamTechnicalStatusEvaluationStandardService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鍗囩増") + @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鍗囩増", notes = "鎶�鏈姸鎬侀壌瀹氳鑼�-鍗囩増") + @PutMapping(value = "/upgrade") + public Result<?> upgrade(@RequestBody EamTechnicalStatusEvaluationStandardRequest request) { + if (request == null) { + return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒"); + } + if (CollectionUtil.isEmpty(request.getTableDetailList())) { + return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒"); + } + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); + request.setStandardCode(codeSeq); + boolean b = eamTechnicalStatusEvaluationStandardService.upgrade(request); + if (!b) { + return Result.error("鍗囩増澶辫触锛�"); + } + return Result.OK("鍗囩増鎴愬姛!"); } /** @@ -146,6 +145,23 @@ } /** + * 鎻愪氦 + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎻愪氦") + @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎻愪氦", notes = "鎶�鏈姸鎬侀壌瀹氳鑼�-鎻愪氦") + @GetMapping(value = "/submit") + public Result<?> submit(@RequestParam(name = "id", required = true) String id) { + EamTechnicalStatusEvaluationStandard entity = eamTechnicalStatusEvaluationStandardService.getById(id); + if (entity != null) { + entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name()); + eamTechnicalStatusEvaluationStandardService.updateById(entity); + } + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** * 閫氳繃excel瀵煎叆鏁版嵁 * * @param request -- Gitblit v1.9.3