Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

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

@@ -20,6 +20,7 @@ import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.*;
 import com.qmth.sop.common.util.DateDisposeUtils;
 import com.qmth.sop.common.util.ServletUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -230,13 +231,15 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
     @Override
     public boolean canUpdateDingSetting(String sopNo) {
         boolean result = true;
-        TBDingSubmit tbDingSubmit = this.getOne(
-                new QueryWrapper<TBDingSubmit>().lambda().eq(TBDingSubmit::getSopNo, sopNo).last(SystemConstant.LIMIT1));
-        if (Objects.nonNull(tbDingSubmit)) {
-            DingSubmitStatusEnum submitStatus = tbDingSubmit.getSubmitStatus();
-            if (!DingSubmitStatusEnum.WILL_SUBMIT.equals(submitStatus) && !DingSubmitStatusEnum.AGREE_WITHDRAW.equals(
-                    submitStatus)) {
-                result = false;
+        List<TBDingSubmit> tbDingSubmitList = this.list(
+                new QueryWrapper<TBDingSubmit>().lambda().eq(TBDingSubmit::getSopNo, sopNo));
+        if (CollectionUtils.isNotEmpty(tbDingSubmitList)) {
+            for (TBDingSubmit tbDingSubmit : tbDingSubmitList) {
+                DingSubmitStatusEnum submitStatus = tbDingSubmit.getSubmitStatus();
+                if (!DingSubmitStatusEnum.WILL_SUBMIT.equals(submitStatus) && !DingSubmitStatusEnum.AGREE_WITHDRAW.equals(submitStatus)) {
+                    result = false;
+                    break;
+                }
             }
         }
         return result;

sop-business/src/main/resources/mapper/TBDingSubmitMapper.xml

@@ -33,7 +33,7 @@
             sta.work_hours AS workHours,
             sta.ding_exception_count AS dingExceptionCount,
             sta.remain_count AS remainCount,
-            IFNULL(ec.cnt,0) AS exceptionCount,
+            sta.exception_count AS exceptionCount,
             IFNULL(tbds.submit_status, 'WILL_SUBMIT') AS submitStatus,
             tbds.id AS submitId,
             tbds.submit_user_id AS submitUserId,
@@ -50,13 +50,6 @@
                 AND sta.user_archives_id = tbds.user_archives_id
                 LEFT JOIN
             sys_user su ON tbds.submit_user_id = su.id
-                LEFT JOIN (
-                    SELECT COUNT(*) AS cnt, sop_no, create_id
-                FROM
-            t_b_ding_apply
-                WHERE approve IS NULL
-                GROUP BY sop_no , create_id) ec ON ec.sop_no = sta.sop_no
-                AND ec.create_id = sta.user_id
         <where>
             AND tbs.status = 'PUBLISH'
             <if test="serviceUnitId != null">
@@ -141,7 +134,7 @@
             sta.work_hours AS workHours,
             sta.ding_exception_count AS dingExceptionCount,
             sta.remain_count AS remainCount,
-            IFNULL(ec.cnt,0) AS exceptionCount,
+            sta.exception_count AS exceptionCount,
             IFNULL(tbds.submit_status, 'WILL_SUBMIT') AS submitStatus,
             tbds.id AS submitId,
             tbds.submit_user_id AS submitUserId,
@@ -158,13 +151,6 @@
                 AND sta.user_archives_id = tbds.user_archives_id
                 LEFT JOIN
             sys_user su ON tbds.submit_user_id = su.id
-                LEFT JOIN (
-                    SELECT COUNT(*) AS cnt, sop_no, create_id
-                FROM
-                t_b_ding_apply
-                WHERE approve IS NULL
-                GROUP BY sop_no , create_id) ec ON ec.sop_no = sta.sop_no
-                AND ec.create_id = sta.user_id
         <where>
             AND tbs.status = 'PUBLISH'
             <if test="serviceUnitId != null">

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