From 1019a0e6d7c01fcdde9d35f3725732001c63dda1 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 19 Feb 2025 18:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BusinessController.java        |  5 ++++
 .../service/impl/BusinessServiceImpl.java     |  8 +++++-
 .../main/resources/mapper/BusinessMapper.xml  | 25 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java
index dd47914..bac8409 100644
--- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java
+++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java
@@ -129,6 +129,11 @@ public class BusinessController {
     public AjaxResult approvalHistory(@RequestBody RequestEntity entity) {
         return flowTaskUtils.approvalHistory(entity);
     }
+    @ApiOperation(value = "审核记录")
+    @PostMapping(value = "/checkHistory")
+    public AjaxResult checkHistory(@RequestBody RequestEntity entity) {
+        return flowTaskUtils.checkHistory(entity);
+    }
 
 
     @ApiOperation(value = "审批列表树")
diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
index 801a29c..b6d4b12 100644
--- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
+++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
@@ -874,7 +874,13 @@ public class BusinessServiceImpl implements BusinessService {
             }
             finalList.get(0).setIsActive("10");
         }
-        return  finalList;
+        for (ConfigurationVo configurationVo : finalList) {
+            if (configurationVo.getAuditStatus() == null){
+                configurationVo.setAuditStatus(4);
+                break;
+            }
+        }
+        return finalList;
     }
 
     @Override
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 985d2e4..5400bdf 100644
--- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
+++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
@@ -817,7 +817,32 @@
         and   user_id=#{userId}
     </select>
     <select id="checkHistory" resultType="com.bonus.flowable.entity.CheckComment">
+        SELECT
+              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
+            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
+          AND pcpr.type = 1
     </select>
 
 </mapper>