From 43129b0bcab1cb8e7df6d4e3ca0a33bffdafdd32 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Mon, 9 Jun 2025 21:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApprovalProcessController.java | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
index 068b01f..a01c1c8 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
@@ -5,14 +5,8 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.database.domain.ApprovalProcess;
-import com.ruoyi.database.domain.BusinessTripApproval;
-import com.ruoyi.database.domain.NonWorkingDayDrinkingReport;
-import com.ruoyi.database.domain.PoliceLeaveApproval;
-import com.ruoyi.database.service.ApprovalProcessService;
-import com.ruoyi.database.service.BusinessTripApprovalService;
-import com.ruoyi.database.service.NonWorkingDayDrinkingReportService;
-import com.ruoyi.database.service.PoliceLeaveApprovalService;
+import com.ruoyi.database.domain.*;
+import com.ruoyi.database.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +36,7 @@ public class ApprovalProcessController extends BaseController {
     private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService;
     private final PoliceLeaveApprovalService policeLeaveApprovalService;
     private final ISysUserService sysUserService;
+    private final gwglLogService gwglLogService;
 
 
     @PostMapping("/list")
@@ -67,6 +62,20 @@ public class ApprovalProcessController extends BaseController {
 
         for (ApprovalProcess process : list) {
 
+            if (process.getMatterType() == 2){
+                gwglLog one = gwglLogService.lambdaQuery()
+                        .eq(gwglLog::getUuid, process.getUuid())
+                        .orderByDesc(gwglLog::getCreateTime)
+                        .last("LIMIT 1")
+                        .one();
+                if (one != null){
+                    if (one.getCheckState() == 0) {
+                        process.setApprovalStatus(0);
+                    }else {
+                        process.setApprovalStatus(1);
+                    }
+                }
+            }
 //            如果创建时间为当天的时间
             if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {
 //                一分钟之内，显示刚刚