From 37d6a48e46a04b9b26bd6c423af85e2ddc9d1a7e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 13 一月 2026 11:51:13 +0800
Subject: [PATCH] 用印管理加一个审批人，然后对接消息通知
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 12 ++++++++++++
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 7 ++++++-
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java | 3 +++
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml | 9 +++++++--
4 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 242072e..66a2d83 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@@ -25,6 +27,9 @@
@Autowired
private SealApplicationManagementService sealApplicationManagementService;
+ @Autowired
+ private ISysNoticeService sysNoticeService;
+
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
@@ -34,6 +39,13 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\n"
+ +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
+ Arrays.asList(sealApplicationManagement.getApproveUserId()),
+ sealApplicationManagement.getTenantId(),
+ "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
index 0dc75a6..8dc8454 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
@@ -8,4 +8,7 @@
private String createUserName;
//鎵�灞為儴闂�
private String department;
+
+ //瀹℃壒浜�
+ private String approveUserName;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index d6d1d81..4055f21 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -32,7 +32,7 @@
* 鐢ㄥ嵃绫诲瀷
*/
@ApiModelProperty("鐢ㄥ嵃绫诲瀷")
- @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=鏈煡")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
@@ -51,6 +51,11 @@
@ApiModelProperty("鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
/**
* 鍒涘缓鑰�
*/
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index b8ad6a7..5da6dff 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,12 +4,17 @@
<select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
+ select sam.*, su.user_name as create_user_name, d.dept_name as department,
+ su1.nick_name as approveUserName
from seal_application_management sam
left join sys_user su on sam.create_user = su.user_id
+ left join sys_user su1 on sam.approve_user_id = su1.user_id
left join sys_user_dept sud on su.user_id = sud.user_id
left join sys_dept d on sud.dept_id = d.dept_id
<where>
+ <if test="ew.applicationNum != null and ew.applicationNum != ''">
+ and sam.application_num like concat('%',#{ew.applicationNum},'%')
+ </if>
<if test="ew.title != null and ew.title != ''">
and sam.title like concat('%',#{ew.title},'%')
</if>
@@ -18,4 +23,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3