巡检计划接口调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -131,14 +131,16 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         String timeStr = patrolInspectionPlanVo.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         Date startDate = OnlineMethod.getDate(timeStr);
         LocalDate ss = null;
-        if (planCycle == 1) {
-            ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 1 * patrolInspectionPlanVo.getWeekCount() - 1);
-        } else if (planCycle == 2) {
-            ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 7 * patrolInspectionPlanVo.getWeekCount() - 1);
-        } else if (planCycle == 3) {
-            ss = OnlineMethod.getMonthDate(startDate, 1 * patrolInspectionPlanVo.getWeekCount());
-        } else if (planCycle == 4) {
-            ss = OnlineMethod.getMonthDate(startDate, 12 * patrolInspectionPlanVo.getWeekCount());
+        if (patrolInspectionPlanVo.getPlanType()==2){
+            if (planCycle == 1) {
+                ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 1 * patrolInspectionPlanVo.getWeekCount() - 1);
+            } else if (planCycle == 2) {
+                ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 7 * patrolInspectionPlanVo.getWeekCount() - 1);
+            } else if (planCycle == 3) {
+                ss = OnlineMethod.getMonthDate(startDate, 1 * patrolInspectionPlanVo.getWeekCount());
+            } else if (planCycle == 4) {
+                ss = OnlineMethod.getMonthDate(startDate, 12 * patrolInspectionPlanVo.getWeekCount());
+            }
         }
         //主表数据添加
         PatrolInspectionPlan patrolInspectionPlan = new PatrolInspectionPlan();
@@ -182,13 +184,13 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         String timeStr3 = patrolInspectionPlanVo.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         int days = 0;
         if (patrolInspectionPlanVo.getPlanType() == 1) {
-            days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate());
+            days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
         } else {
             LocalDate date = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, 7 * (patrolInspectionPlanVo.getWeekCount() + 1));
             days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), date);
         }
         for (int i = 0; i < days; i++) {
-            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i + 1);
+            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i);
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
@@ -201,11 +203,17 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         //子表数据添加
         if (patrolInspectionPlanVo.getPlanType() == 1) {//普通计划
             //计算两时间天数
-            int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate());
+            int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
+//            if (patrolInspectionPlanVo.getStartDate().equals(patrolInspectionPlanVo.getEndDate())){
+//                day = 1;
+//            }else {
+//                day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
+//            }
+
             String timeStr1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             for (int i = 0; i < day; i++) {
                 for (int j = 0; j < patrolInspectionPlanVo.getPlanScheduleList().size(); j++) {
-                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i + 1);
+                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i);
                     Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
                     String week = OnlineMethod.getWeekOfDate(date);
                     if (!patrolInspectionPlanVo.getRestDay().contains(week)) {
@@ -288,16 +296,19 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         String timeStr = patrolInspectionPlanVo.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         Date startDate = OnlineMethod.getDate(timeStr);
         LocalDate ss = null;
-        if (planCycle == 1) {
-            ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 1 * patrolInspectionPlanVo.getWeekCount() - 1);
-        } else if (planCycle == 2) {
-            ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 7 * patrolInspectionPlanVo.getWeekCount() - 1);
-        } else if (planCycle == 3) {
-            ss = OnlineMethod.getMonthDate(startDate, 1 * patrolInspectionPlanVo.getWeekCount());
-        } else if (planCycle == 4) {
-            ss = OnlineMethod.getMonthDate(startDate, 12 * patrolInspectionPlanVo.getWeekCount());
+        if (patrolInspectionPlanVo.getPlanType()==2){
+            if (planCycle == 1) {
+                ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 1 * patrolInspectionPlanVo.getWeekCount() - 1);
+            } else if (planCycle == 2) {
+                ss = OnlineMethod.getDate(timeStr, "yyyy-MM-dd", true, 7 * patrolInspectionPlanVo.getWeekCount() - 1);
+            } else if (planCycle == 3) {
+                ss = OnlineMethod.getMonthDate(startDate, 1 * patrolInspectionPlanVo.getWeekCount());
+            } else if (planCycle == 4) {
+                ss = OnlineMethod.getMonthDate(startDate, 12 * patrolInspectionPlanVo.getWeekCount());
+            }
         }
 
+
         //主表数据修改
         PatrolInspectionPlan patrolInspectionPlan = new PatrolInspectionPlan();
         patrolInspectionPlan.setId(patrolInspectionPlanVo.getId());
@@ -354,13 +365,13 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         String timeStr3 = patrolInspectionPlanVo.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         int days = 0;
         if (patrolInspectionPlanVo.getPlanType() == 1) {
-            days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate());
+            days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
         } else {
             LocalDate date = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, 7 * (patrolInspectionPlanVo.getWeekCount() + 1));
             days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), date);
         }
         for (int i = 0; i < days; i++) {
-            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i + 1);
+            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i );
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
@@ -386,11 +397,11 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
 
         if (patrolInspectionPlanVo.getPlanType() == 1) {//普通计划
             //计算两时间天数
-            int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate());
+            int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
             String timeStr1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             for (int i = 0; i < day; i++) {
                 for (int j = 0; j < patrolInspectionPlanVo.getPlanScheduleList().size(); j++) {
-                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i + 1);
+                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i );
                     Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
                     String week = OnlineMethod.getWeekOfDate(date);
                     if (!patrolInspectionPlanVo.getRestDay().contains(week)) {