fix:

考勤提交 考勤异常工时计算错误

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

@@ -39,7 +39,7 @@
                  tbs.service_lead_id AS serviceUnitLeaderId,
                  tbc.lead_id AS regionManagerId,
                  tbc.region_coordinator_id AS coordinatorId,
-                 IF(tffa.status IN ('已撤回','已终止','已结束'),
+                 IF(tffa.status IN ('CANCEL','END','FINISH'),
                      TIMESTAMPDIFF(DAY, FROM_UNIXTIME(SUBSTRING(tffa.create_time, 1, 10), '%Y-%m-%d'), FROM_UNIXTIME(SUBSTRING(tffa.update_time, 1, 10), '%Y-%m-%d')),
                      TIMESTAMPDIFF(DAY, FROM_UNIXTIME(SUBSTRING(tffa.create_time, 1, 10), '%Y-%m-%d'), NOW()))
                      - normal_days + 1 AS dingExceptionCount
@@ -190,7 +190,7 @@
                  tbs.service_lead_id AS serviceUnitLeaderId,
                  tbc.lead_id AS regionManagerId,
                  tbc.region_coordinator_id AS coordinatorId,
-                 IF(tffa.status IN ('已撤回','已终止','已结束'),
+                 IF(tffa.status IN ('CANCEL','END','FINISH'),
                  TIMESTAMPDIFF(DAY, FROM_UNIXTIME(SUBSTRING(tffa.create_time, 1, 10), '%Y-%m-%d'), FROM_UNIXTIME(SUBSTRING(tffa.update_time, 1, 10), '%Y-%m-%d')),
                  TIMESTAMPDIFF(DAY, FROM_UNIXTIME(SUBSTRING(tffa.create_time, 1, 10), '%Y-%m-%d'), NOW()))
                  - normal_days + 1 AS dingExceptionCount

sop-common/src/main/java/com/qmth/sop/common/util/DateDisposeUtils.java

@@ -155,40 +155,6 @@ public class DateDisposeUtils extends DateUtils {
         return simpleDateFormat.format(d1);
     }
 
-    /**
-     * 查询两个日期之间的所有日期集合
-     *
-     * @param startTime 开始日期   2023-09-01
-     * @param endTime   结束日期   2023-09-04
-     * @return 所有日期集合  [2023-09-01, 2023-09-02, 2023-09-03, 2023-09-04]
-     */
-    public static List<String> getDaysBetween(String startTime, String endTime) {
-        // 返回的日期集合
-        List<String> days = new ArrayList<>();
-
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        try {
-            Date start = dateFormat.parse(startTime);
-            Date end = dateFormat.parse(endTime);
-
-            Calendar tempStart = Calendar.getInstance();
-            tempStart.setTime(start);
-
-            Calendar tempEnd = Calendar.getInstance();
-            tempEnd.setTime(end);
-//            tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
-            while (tempStart.before(tempEnd) || tempStart.equals(tempEnd)) {
-                days.add(dateFormat.format(tempStart.getTime()));
-                tempStart.add(Calendar.DAY_OF_YEAR, 1);
-            }
-
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-        return days;
-    }
-
     /**
      * 查询两个日期之间的所有日期集合(包括开始时间和结束时间当天)
      *