fix:修改排班日期推算bug

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java

@@ -187,11 +187,14 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
             LocalDate beginDate = DateUtils.localDateFromStr(beginTime);
             LocalDate beginDate = DateUtils.localDateFromStr(beginTime);
             LocalDate endDate = DateUtils.localDateFromStr(repeatEndDate);
             LocalDate endDate = DateUtils.localDateFromStr(repeatEndDate);
             LocalDate current = beginDate;
             LocalDate current = beginDate;
+            // 保留固定基准开始时间，后续日历根据此日期推算
+            final String finalBeginTime = beginTime;
+            final String finalEndTime = endTime;
             while (!current.isAfter(endDate)) {
             while (!current.isAfter(endDate)) {
                 // 开始时间，结束时间平移
                 // 开始时间，结束时间平移
-                int days = Period.between(beginDate, current).getDays();
-                beginTime = DateUtils.formatDateTime(DateUtils.localDateTimeFromStr(beginTime).plusDays(days));
-                endTime = DateUtils.formatDateTime(DateUtils.localDateTimeFromStr(endTime).plusDays(days));
+                long days = beginDate.until(current, ChronoUnit.DAYS);
+                beginTime = DateUtils.formatDateTime(DateUtils.localDateTimeFromStr(finalBeginTime).plusDays(days));
+                endTime = DateUtils.formatDateTime(DateUtils.localDateTimeFromStr(finalEndTime).plusDays(days));
                 addOneEngineerPlan(userId, engineerCode, type, beginTime, endTime, remark);
                 addOneEngineerPlan(userId, engineerCode, type, beginTime, endTime, remark);
                 current = getNextDate(current, repeatType);
                 current = getNextDate(current, repeatType);
             }
             }
@@ -406,7 +409,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
         return mapping.get(type);
         return mapping.get(type);
     }
     }
 
 
-    private String newPlanId(){
+    private String newPlanId() {
         String idStr = IdUtil.getSnowflake().nextIdStr();
         String idStr = IdUtil.getSnowflake().nextIdStr();
         return idStr.substring(idStr.length() - 10);
         return idStr.substring(idStr.length() - 10);
     }
     }