From 4f68c124188e25f23b73a28794c5d39c713da786 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 20 Feb 2025 19:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/BusinessMapper.xml  | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
index 120dabe..2d13079 100644
--- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
+++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
@@ -818,30 +818,34 @@
     </select>
     <select id="checkHistory" resultType="com.bonus.flowable.entity.CheckComment">
         SELECT DISTINCT
-              sd.dept_name as section,
-              su.nick_name as name,
-              pcpr.audit_time as time,
-              CASE
-
-                  WHEN pcpr.audit_status = '1' THEN
-                      '审核通过'
-                  WHEN pcpr.audit_status = '2' THEN
-                      '审核驳回'
-                  WHEN pcpr.audit_status = '3' THEN
-                      '终审通过' ELSE '待审核'
-                  END AS STATUS,
-              pcpr.remark as turnDownReason,
-              pcpr.audit_remark as reason
+            IFNULL( sd.dept_name, '' ) AS section,
+	        IFNULL( su.nick_name, '' ) AS NAME,
+	        IFNULL( pcp.id, '' ) AS id,
+	        IFNULL( pcp.user_id, '' ) AS userId,
+	        IFNULL( pcp.task_id, '' ) AS taskId,
+	        IFNULL( pcp.exam_type, '' ) AS examType,
+	        IFNULL( pcp.sort, '' ) AS sort,
+	        IFNULL( pcpr.audit_time, '' ) AS time,
+        CASE
+		WHEN pcpr.audit_status = '1' THEN
+		'审核通过'
+		WHEN pcpr.audit_status = '2' THEN
+		'审核驳回'
+		WHEN pcpr.audit_status = '3' THEN
+		'终审通过' ELSE '待审核'
+        END AS STATUS,
+	        IFNULL( pcpr.remark, '' ) AS turnDownReason,
+	        IFNULL( pcpr.audit_remark, '' ) AS reason
         FROM
-            pt_check_person pcp
-                LEFT JOIN pt_check_person_remark pcpr ON pcp.task_id = pcpr.task_id
-                AND pcp.user_id = pcpr.user_id
-                AND pcp.version = pcpr.version
-                LEFT JOIN sys_user su ON pcp.user_id = su.user_id
-                LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
+	        nxdt_ii.pt_check_person pcp
+	        LEFT JOIN nxdt_ii.pt_check_person_remark pcpr ON pcp.task_id = pcpr.task_id
+	        AND pcp.user_id = pcpr.user_id
+	        AND pcp.version = pcpr.version
+	        LEFT JOIN nxdt_ii.sys_user su ON pcp.user_id = su.user_id
+	        LEFT JOIN nxdt_ii.sys_dept sd ON su.dept_id = sd.dept_id
         WHERE
-            pcp.task_id = #{taskId}
-          AND pcp.type = 1
+	        pcp.task_id = #{taskId}
+	        AND pcp.type = 1
     </select>
 
 </mapper>