From bccaf7e7d0b50ff9df3120c38193d77d60fe26eb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 七月 2025 14:46:00 +0800
Subject: [PATCH] art: 技术状态鉴定工单变更-提交、作废，审批接口添加
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
index 951b653..f6f10c9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
@@ -5,10 +5,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.enums.MessageSplitTypeEnum;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
@@ -75,7 +77,13 @@
@ApiOperation(value = "mdc娑堟伅纭琛�-娣诲姞", notes = "mdc娑堟伅纭琛�-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcMessageApproval mdcMessageApproval) {
- mdcMessageApprovalService.save(mdcMessageApproval);
+ if (StringUtils.isBlank(mdcMessageApproval.getEquipmentId())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcMessageApprovalService.add(mdcMessageApproval);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -172,7 +180,8 @@
//涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�侀暱鏃堕棿鏈彉鍖栧師鍥犱笂鎶ョ‘璁わ紒");
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
messageDTO.setFromUser(user.getUsername());
LoginUser userById = sysBaseApi.getUserById(approverId);
@@ -196,8 +205,9 @@
//涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�佹秷鎭紒");
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
messageDTO.setFromUser("admin");
+ messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
messageDTO.setToUser(mdcMessageApproval.getUpdateBy());
messageDTO.setContent("鎮ㄧ殑璁惧缂栧彿涓� [" + mdcMessageApproval.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏃堕棿鏈彉鍖栦笂鎶ュ凡琚澶囪秴绾х鐞嗗憳鎷掔粷锛岃閲嶆柊濉啓涓婃姤鍘熷洜锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
--
Gitblit v1.9.3