系统bug修改

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();

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;
 
 
 

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'">

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>