bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml

@@ -817,34 +817,30 @@
     </select>
     <select id="checkHistory" resultType="com.bonus.flowable.entity.CheckComment">
         SELECT DISTINCT
-            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
+              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
         FROM
-	        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
+            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
         WHERE
-	        pcp.task_id = #{taskId}
-	        AND pcp.type = 1
+            pcp.task_id = #{taskId}
+          AND pcp.type = 1
     </select>
 
 </mapper>