Merge branch 'dev_1.1.1' into dev_1.1.2

merge

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -1402,28 +1402,28 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                     tsJobRemindService.updateJobRemind(Long.parseLong(task.getId()));
                 }
                 FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                if (tfFlowApprove.getSetup().intValue() == 5) {//扫描准备流程
+                if (tfFlowApprove.getSetup().intValue() == 3) {//扫描准备流程
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.SCAN_START_TIME.getKey());
                     execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "扫描准备");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 5 && tfFlowApprove.getSetup().intValue() <= 6) {//扫描收尾检查
+                if (tfFlowApprove.getSetup().intValue() >= 3 && tfFlowApprove.getSetup().intValue() <= 6) {//扫描收尾检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.SCAN_END_TIME.getKey());
                     execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "校验收尾");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 5 && tfFlowApprove.getSetup().intValue() <= 7) {//阅卷参数检查
+                if (tfFlowApprove.getSetup().intValue() >= 3 && tfFlowApprove.getSetup().intValue() <= 7) {//阅卷参数检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.MARK_START_TIME.getKey());
                     execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "评卷准备");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 5 && tfFlowApprove.getSetup().intValue() <= 9) {//阅卷收尾检查
+                if (tfFlowApprove.getSetup().intValue() >= 3 && tfFlowApprove.getSetup().intValue() <= 9) {//阅卷收尾检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.MARK_END_TIME.getKey());
                     execField = ProcessLimitedEnum.MARK_END_TIME.getKey();

sop-business/src/main/resources/db/log/haoguanghui_update_log.sql

@@ -50,3 +50,6 @@ INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`,
 
 -- 2024-09-14
 INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (291, '客户表查询', '/api/sys/custom/list/by/serviceUnit', 'URL', 64, 34, 'SYS', NULL, 1, 1, 0);
+
+-- 2024-09-18
+update sys_privilege set property='SYS' where id=426;

sop-task/src/main/java/com/qmth/sop/task/start/StartRunning.java

@@ -90,8 +90,8 @@ public class StartRunning implements CommandLineRunner {
         Map<Object,Object> dingStatisticMap = new HashMap<>();
         dingStatisticMap.put(SystemConstant.NAME, DingStatisticJob.class.getName());
         quartzService.deleteJob(JobEnum.DING_STATISTIC.name(), JobEnum.DING_STATISTIC_GROUP.name());
-//        quartzService.addJob(DingStatisticJob.class, JobEnum.DING_STATISTIC.name(), JobEnum.DING_STATISTIC_GROUP.name(), "0 0 2 * * ?", dingStatisticMap);
-        quartzService.addJob(DingStatisticJob.class, JobEnum.DING_STATISTIC.name(), JobEnum.DING_STATISTIC_GROUP.name(), "0 0/1 * * * ?", dingStatisticMap);
+        quartzService.addJob(DingStatisticJob.class, JobEnum.DING_STATISTIC.name(), JobEnum.DING_STATISTIC_GROUP.name(), "0 0 2 * * ?", dingStatisticMap);
+//        quartzService.addJob(DingStatisticJob.class, JobEnum.DING_STATISTIC.name(), JobEnum.DING_STATISTIC_GROUP.name(), "0 0/1 * * * ?", dingStatisticMap);
         log.info("考勤统计定时任务 end");
 
         log.info("服务器启动时执行 end");