From c8be659bd7a8fd50be7dd5fd257d7966e63c1b03 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 14 十一月 2025 14:32:55 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 2 +-
multi-system/src/main/resources/mapper/system/MemoMapper.xml | 45 +++++++++++++++++++++++----------------------
2 files changed, 24 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..377ccd2 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,30 +26,31 @@
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} )
diff --git a/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 52be8c1..83c3af8 100644
--- a/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -51,7 +51,7 @@
AND a.type = #{type}
</if>
<if test="deptId != null">
- AND a.deptId = #{dept_id}
+ AND a.dept_id = #{deptId}
</if>
<if test="createBy != null and createBy != ''">
AND a.create_by like concat('%', #{createBy}, '%')
--
Gitblit v1.9.2