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/TBDingStatisticServiceImpl.java

@@ -11,7 +11,6 @@ import com.qmth.sop.business.mapper.TBDingStatisticMapper;
 import com.qmth.sop.business.service.*;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.DingDateTypeEnum;
-import com.qmth.sop.common.enums.DingSubmitStatusEnum;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.SopRoleTypeEnum;
 import com.qmth.sop.common.util.DateDisposeUtils;
@@ -228,18 +227,14 @@ public class TBDingStatisticServiceImpl extends ServiceImpl<TBDingStatisticMappe
             TBDingStatistic tbDingStatistic;
             tbDingStatistic = this.findBySopNoAndUserArchivesId(sopNo, userArchivesId);
             if (Objects.isNull(tbDingStatistic)) {
+                // 新增考勤统计
                 tbDingStatistic = new TBDingStatistic();
                 tbDingStatistic.insertInfo(requestUserId);
             } else {
-                TBDingSubmit tbDingSubmit = tbDingSubmitService.getOne(
-                        new QueryWrapper<TBDingSubmit>().lambda().eq(TBDingSubmit::getSopNo, sopNo).eq(TBDingSubmit::getUserArchivesId, userArchivesId).last(SystemConstant.LIMIT1));
-                if (Objects.nonNull(tbDingSubmit)) {
-                    DingSubmitStatusEnum submitStatus = tbDingSubmit.getSubmitStatus();
-                    if (!DingSubmitStatusEnum.WILL_SUBMIT.equals(submitStatus)
-                            && !DingSubmitStatusEnum.AGREE_WITHDRAW.equals(submitStatus)) {
-                        // 已提交的考勤不再计算了
-                        continue;
-                    }
+                // 更新考勤统计
+                if (!tbDingSubmitService.canUpdateDingSetting(sopNo, userId)) {
+                    // 已提交的考勤不再计算了
+                    continue;
                 }
                 tbDingStatistic.updateInfo(requestUserId);
             }