Merge branch 'dev_v1.0.1' into dev_1.0.4

merge

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

@@ -52,7 +52,7 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
         List<DingSubmitStatusEnum> dingSubmitStatusEnumList = new ArrayList<>();
         if (dingSubmitStatusDesc != null && dingSubmitStatusDesc.length() > 0) {
             dingSubmitStatusEnumList = Arrays.stream(DingSubmitStatusEnum.values())
-                    .filter(e -> e.getSubmitDesc().equals(dingSubmitStatusDesc))
+                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc))
                     .collect(Collectors.toList());
         }
         archivesName = SystemConstant.translateSpecificSign(archivesName);
@@ -307,7 +307,7 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
         List<DingSubmitStatusEnum> dingSubmitStatusEnumList = new ArrayList<>();
         if (dingSubmitStatusDesc != null && dingSubmitStatusDesc.length() > 0) {
             dingSubmitStatusEnumList = Arrays.stream(DingSubmitStatusEnum.values())
-                    .filter(e -> e.getSubmitDesc().equals(dingSubmitStatusDesc))
+                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc))
                     .collect(Collectors.toList());
         }
         archivesName = SystemConstant.translateSpecificSign(archivesName);
@@ -351,7 +351,7 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             dto.setWorkHours(e.getWorkHours());
             dto.setViolationDays(e.getViolationDays());
             dto.setDingExceptionCount(e.getDingExceptionCount());
-            dto.setRemainCount(e.getRemainCount());
+            dto.setRemainCount(tbDingService.findRemainCount(e.getUserId(), e.getSopNo()));
             dto.setExceptionCount(e.getExceptionCount());
             dto.setSubmitStatus(e.getSubmitStatus().getSubmitDesc());
             dto.setSubmitUserName(e.getSubmitUserName());

sop-common/src/main/java/com/qmth/sop/common/enums/DingSubmitStatusEnum.java

@@ -6,23 +6,39 @@ package com.qmth.sop.common.enums;
  * @Date: 2023-08-24
  */
 public enum DingSubmitStatusEnum {
-    WILL_SUBMIT("工程师未提交考勤或撤回了考勤提交的状态","待提交","--"),
-    ALREADY_SUBMIT("工程师提交考勤","已提交","已提交"),
-    APPLY_WITHDRAW("工程师申请撤回考勤提交","已提交","申请撤回"),
-    AGREE_WITHDRAW("管理员同意撤回","待提交","已撤回"),
-    AGREE_DING("管理员同意考勤申请","审核通过","审核通过")
-    ;
-
-    DingSubmitStatusEnum(String operate, String submitDesc, String auditDesc) {
+    WILL_SUBMIT("工程师未提交考勤或撤回了考勤提交的状态", "待提交", "--", "未提交"),
+    ALREADY_SUBMIT("工程师提交考勤", "已提交", "已提交", "已提交"),
+    APPLY_WITHDRAW("工程师申请撤回考勤提交", "已提交", "申请撤回", "已提交"),
+    AGREE_WITHDRAW("管理员同意撤回", "待提交", "已撤回", "未提交"),
+    AGREE_DING("管理员同意考勤申请", "审核通过", "审核通过", "已提交");
+
+    DingSubmitStatusEnum(String operate, String submitDesc, String auditDesc, String dingSubmitQuery) {
         this.operate = operate;
         this.submitDesc = submitDesc;
         this.auditDesc = auditDesc;
+        this.dingSubmitQuery = dingSubmitQuery;
     }
 
+    /**
+     * 操作
+     */
     private final String operate;
+
+    /**
+     * 考勤提交状态
+     */
     private final String submitDesc;
+
+    /**
+     * 工时统计描述
+     */
     private final String auditDesc;
 
+    /**
+     * 考勤提交衩裙
+     */
+    private final String dingSubmitQuery;
+
     public String getOperate() {
         return operate;
     }
@@ -35,6 +51,10 @@ public enum DingSubmitStatusEnum {
         return auditDesc;
     }
 
+    public String getDingSubmitQuery() {
+        return dingSubmitQuery;
+    }
+
     @Override
     public String toString() {
         return submitDesc;