Merge branch 'develop-16542' into 'develop'

容量初始化T+20

See merge request !357

project-order/src/main/java/com/dituhui/pea/order/scheduler/InitEngineerCapacityScheduler.java

@@ -149,6 +149,8 @@ public class InitEngineerCapacityScheduler {
                     lengthOfLeave += DateTimeUtil.betweenTwoTime(leaveStartTime, sliceEndLocalTime, TimeUnit.MINUTES);
                     lengthOfLeave += DateTimeUtil.betweenTwoTime(leaveStartTime, sliceEndLocalTime, TimeUnit.MINUTES);
                 } else if (leaveStartTime.isBefore(sliceStartLocalTime) && leaveEndTime.isAfter(sliceEndLocalTime)) {
                 } else if (leaveStartTime.isBefore(sliceStartLocalTime) && leaveEndTime.isAfter(sliceEndLocalTime)) {
                     lengthOfLeave += DateTimeUtil.betweenTwoTime(sliceStartLocalTime, sliceEndLocalTime, TimeUnit.MINUTES);
                     lengthOfLeave += DateTimeUtil.betweenTwoTime(sliceStartLocalTime, sliceEndLocalTime, TimeUnit.MINUTES);
+                } else if (leaveStartTime.isBefore(sliceStartLocalTime) && leaveEndTime.compareTo(sliceEndLocalTime) <=0) {
+                    lengthOfLeave += DateTimeUtil.betweenTwoTime(sliceStartLocalTime, leaveEndTime, TimeUnit.MINUTES);
                 }
                 }
             }
             }
             // 剩余可约容量
             // 剩余可约容量

project-order/src/main/resources/application.yaml

@@ -74,21 +74,21 @@ scheduler:
   init-engineer-capacity:
   init-engineer-capacity:
     # 每天22点1次
     # 每天22点1次
     cron-expr: 0 0 22 * * ?
     cron-expr: 0 0 22 * * ?
-    day-offset-begin: 0
-    day-offset-end: 14
+    day-offset-begin: 1
+    day-offset-end: 20
     rewrite-force: true
     rewrite-force: true
 
 
   calc-engineer-capacity:
   calc-engineer-capacity:
     # 8-20点，每30分钟1次
     # 8-20点，每30分钟1次
     cron-expr: 0 */30 1-23 * * ?
     cron-expr: 0 */30 1-23 * * ?
     day-offset-begin: 0
     day-offset-begin: 0
-    day-offset-end: 14
+    day-offset-end: 20
 
 
   calc-org-capacity:
   calc-org-capacity:
     # 8-20点，每小时1次
     # 8-20点，每小时1次
     cron-expr: 0 0 1-23 * * ?
     cron-expr: 0 0 1-23 * * ?
     day-offset-begin: 0
     day-offset-begin: 0
-    day-offset-end: 14
+    day-offset-end: 20
 logging:
 logging:
   level:
   level:
     root: info
     root: info