From b0986b9751716b19abd7d3e6d5c7a3765ea31534 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 30 Apr 2025 13:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/job/controller/SysJobController.java | 2 ++
 .../src/main/java/com/bonus/project/domain/SubPerson.java    | 4 ++++
 .../src/main/resources/mapper/system/ConsApprovalMapper.xml  | 4 +++-
 .../main/resources/mapper/system/OutsourcingProMapper.xml    | 5 ++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/controller/SysJobController.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/controller/SysJobController.java
index d31a7b1..1e17b65 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/controller/SysJobController.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/controller/SysJobController.java
@@ -23,6 +23,7 @@ import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -201,6 +202,7 @@ public class SysJobController extends BaseController
     @RequiresPermissions("monitor:job:updateVideoToken")
     @DeleteMapping("/{updateVideoToken}")
     @SysLog(title = "定时任务", businessType = OperaType.DELETE,logType = 0,module = "系统监控->定时任务",details = "定时更新视频Token")
+     @PostConstruct
     public AjaxResult updateVideoToken() throws SchedulerException, TaskException
     {
         jobService.updateVideoToken();
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
index b2ace8b..e1aa00b 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
@@ -161,6 +161,10 @@ public class SubPerson extends BaseBean implements Serializable {
     private int dataType=0;
 
     private List<String> proInsId;
+    /**
+     * 文件是否存在
+     */
+    private String fileIsActive;
 
 
 
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
index bc96fca..3445a96 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
@@ -78,7 +78,9 @@
             </foreach>
             )
         </if>
-
+        <if test="status==2 or status=='2'">
+            and  lpc.into_status= #{status}
+        </if>
     </select>
     <select id="getAuditRecord" resultType="com.bonus.project.domain.AuditBean">
         <if test="userType == '01'">
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml
index 2b29781..b48e4b4 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml
@@ -397,7 +397,7 @@
         '已入场', '已离场')) as status
         from (select @rowNum := 0) r,pt_cons_person pcp
         left join
-        (select cons_persion_id,pro_id,cont_uuid,sub_uuid,uuid,admission_date,departure_date from
+        (select cons_persion_id,pro_id,cont_uuid,sub_uuid,uuid,admission_date,departure_date,is_exist_file from
         lk_cont_person lcp
         <if test="userType != '00'">
             where lcp.pro_id = #{proId}
@@ -413,6 +413,9 @@
         <if test="consUuid != null and consUuid != ''">
             and re.cont_uuid = #{consUuid}
         </if>
+          <if test="fileIsActive!=null and fileIsActive!=''">
+              and  re.is_exist_file=#{fileIsActive}
+          </if>
         <if test="subUuid != null and subUuid != ''">
             and re.sub_uuid = #{subUuid}
         </if>