From 564392dded17bac3ee85b66227099d68800ee4e0 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 09 十二月 2025 15:34:49 +0800
Subject: [PATCH] 修改功能

---
 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java |    2 +-
 multi-system/src/main/resources/mapper/system/MemoMapper.xml                |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java
index 12838f9..7924d67 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java
@@ -11,6 +11,6 @@
     private String title;
     @ApiModelProperty(value = "数据id")
     private String dataId;
-    @ApiModelProperty(value = "数据类型1内审实施计划2培训计划3项目评审4年度检定计划5用章审批(申请)6用章审批(审批)")
+    @ApiModelProperty(value = "数据类型1内审实施计划2培训计划3项目评审4年度检定计划5用章审批(申请)6用章审批(审批)7颁布令")
     private String type;
 }
diff --git a/multi-system/src/main/resources/mapper/system/MemoMapper.xml b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
index dee652b..2fed3ca 100644
--- a/multi-system/src/main/resources/mapper/system/MemoMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
@@ -63,5 +63,13 @@
         WHERE a.del_flag = 0
         AND (a.next_check = #{userId} )
         AND a.`status` = 1 and a.company_id = #{companyId}
+        UNION ALL
+        SELECT  concat(DATE(a.create_time),',您有新的颁布审批请查看手机端小程序!') as title,
+        '7' AS type,
+        a.id AS dataId
+        FROM proclaim a
+        WHERE a.del_flag = 0
+        AND a.check_id = #{userId}
+        AND a.`status` = 0 and a.company_id = #{companyId}
     </select>
 </mapper>

--
Gitblit v1.9.2