From c26e227abe288476c11b0a8b7875045e71efa14c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Thu, 30 Apr 2026 17:30:00 +0800
Subject: [PATCH] 新增修改
---
multi-system/src/main/resources/mapper/system/MemoMapper.xml | 80 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/MemoMapper.xml b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
index 6ec692d..4c2f091 100644
--- a/multi-system/src/main/resources/mapper/system/MemoMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
@@ -7,15 +7,15 @@
<select id="getIndexTitle" resultType="com.gkhy.exam.system.domain.vo.IndexDataRep" parameterType="com.gkhy.exam.system.domain.vo.IndexSearch">
<if test="keyword != '' and keyword != null">
SELECT CONCAT(`year`, '年内审实施计划') AS title,
- '1' AS type,
- id AS dataId
+ '1' AS type,
+ id AS dataId
FROM internal_audit_carry
WHERE del_flag = 1
AND review_start = DATE(
NOW()) and company_id = #{companyId}
UNION ALL
- SELECT a.device_name AS title,
- '4' AS type,
+ SELECT a.device_name AS title,
+ '4' AS type,
a.annual_verification_id AS dataId
FROM annual_verification_device a
INNER JOIN annual_verification_plan b ON a.annual_verification_id = b.id
@@ -26,33 +26,67 @@
UNION ALL
</if>
<if test="keyword1 != '' and keyword1 != null">
- SELECT train_name AS title,
- '2' AS type,
- id AS dataId
- FROM train_plan
- WHERE del_flag = 1
- AND DATE_SUB(DATE(train_time), INTERVAL 1 MONTH) = DATE(
- NOW()) and company_id = #{companyId}
- UNION ALL
+ SELECT train_name AS title,
+ '2' AS type,
+ id AS dataId
+ FROM train_plan
+ WHERE del_flag = 1
+ AND DATE_SUB(DATE(train_time), INTERVAL 1 MONTH) = DATE(
+ NOW()) and company_id = #{companyId}
+ UNION ALL
</if>
SELECT b.item_name AS title,
- '3' AS type,
- a.id AS dataId
+ '3' AS type,
+ a.id AS dataId
FROM item_review a
- INNER JOIN item b ON b.id = a.item_id
- AND b.del_flag = 1
- INNER JOIN item_review_user c ON c.review_id = a.id
- AND c.del_flag = 0
+ INNER JOIN item b ON b.id = a.item_id
+ AND b.del_flag = 1
+ INNER JOIN item_review_user c ON c.review_id = a.id
+ inner join ex_student ex on ex.id = c.review_user_id
+ AND c.del_flag = 0
WHERE a.del_flag = 0
- AND c.review_user_id = #{userId}
- AND c.`status` = 2 and a.company_id = #{companyId}
+ AND ex.user_id = #{userId}
+ AND c.`status` = 2 and a.company_id = #{companyId}
UNION ALL
SELECT a.use_seal_cause AS title,
- '5' AS type,
- a.id AS dataId
+ '5' AS type,
+ a.id AS dataId
FROM use_seal_apply a
WHERE a.del_flag = 0
- AND (a.apply_user_id = #{userId} or a.next_check = #{userId} )
+ AND (a.apply_user_id = #{userId} )
AND a.`status` = 1 and a.company_id = #{companyId}
+ UNION ALL
+ SELECT a.use_seal_cause AS title,
+ '6' AS type,
+ a.id AS dataId
+ FROM use_seal_apply a
+ 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}
+ UNION ALL
+ SELECT
+ cl.contract_name AS title,
+ '8' AS type,
+ cr.id AS dataId
+ FROM
+ contract_review cr
+ LEFT JOIN contract_ledger cl ON cr.contract_id = cl.id
+ WHERE
+ cr.del_flag = 1 and cr.status = 0
+ AND (
+ EXISTS ( SELECT 1 FROM contract_review_mess crm WHERE crm.review_id = cr.id AND crm.STATUS = 0 AND crm.review_user = #{userId} )
+ OR (
+ NOT EXISTS ( SELECT 1 FROM contract_review_mess crm WHERE crm.review_id = cr.id AND crm.STATUS = 0 )
+ AND cr.legal_person = #{userId}
+ )
+ )
</select>
</mapper>
--
Gitblit v1.9.2