巡检计划相关接口调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPlan.java

@@ -113,7 +113,7 @@ public class PatrolInspectionPlan implements Serializable {
     /**
      * 周数
      */
-    private String weekCount;
+    private Integer weekCount;
 
 
 }

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

@@ -88,6 +88,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                 patrolInspectionAreaVo.setCreateTime(patrolInspectionAreaList.get(i).getCreateTime());
                 patrolInspectionAreaVo.setEnable(patrolInspectionAreaList.get(i).getEnable());
                 patrolInspectionAreaVo.setSiteCount(0);
+                patrolInspectionAreaVo.setPlanCount(0);
                 for (int j = 0; j < dataCountVoList.size(); j++) {
                     if (patrolInspectionAreaList.get(i).getId() == dataCountVoList.get(j).getId()) {
                         patrolInspectionAreaVo.setPlanCount(dataCountVoList.get(j).getListCount());
@@ -129,6 +130,8 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         patrolInspectionPlan.setEnable(1);
         patrolInspectionPlan.setTenantId(SecurityUtils.getTenantId());
         patrolInspectionPlan.setCompanyId(patrolInspectionPlanVo.getCompanyId());
+        patrolInspectionPlan.setRestDay(patrolInspectionPlanVo.getRestDay());
+        patrolInspectionPlan.setWeekCount(patrolInspectionPlanVo.getWeekCount());
         this.save(patrolInspectionPlan);
         Integer fid = patrolInspectionPlan.getId();
         //巡检日程添加
@@ -154,7 +157,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), date);
         }
         for (int i = 0; i < days; i++) {
-            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i);
+            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i+1);
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
@@ -171,7 +174,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             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);
+                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i+1);
                     Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
                     String week = OnlineMethod.getWeekOfDate(date);
                     if (!patrolInspectionPlanVo.getRestDay().contains(week)) {
@@ -271,6 +274,8 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         patrolInspectionPlan.setIntervalTime(patrolInspectionPlanVo.getIntervalTime());
         patrolInspectionPlan.setPlanDescribe(patrolInspectionPlanVo.getPlanDescribe());
         patrolInspectionPlan.setCompanyId(patrolInspectionPlanVo.getCompanyId());
+        patrolInspectionPlan.setRestDay(patrolInspectionPlanVo.getRestDay());
+        patrolInspectionPlan.setWeekCount(patrolInspectionPlanVo.getWeekCount());
         this.updateById(patrolInspectionPlan);
         //巡检日程更新
         LambdaQueryWrapper<PlanSchedule> queryWrapper = Wrappers.lambdaQuery();
@@ -313,7 +318,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             days = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), date);
         }
         for (int i = 0; i < days; i++) {
-            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i);
+            LocalDate date1 = OnlineMethod.getDate(timeStr3, "yyyy-MM-dd", true, i+1);
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
@@ -343,7 +348,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             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);
+                    LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i+1);
                     Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
                     String week = OnlineMethod.getWeekOfDate(date);
                     if (!patrolInspectionPlanVo.getRestDay().contains(week)) {
@@ -530,7 +535,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             list1.add(patrolInspectionPlanDataVo);
         }
         List<PatrolInspectionPlanDataVo> list3 = list1.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        return new CommonPage<>(list3, list1.size(), pageNum, pageSize);
+        return new CommonPage<>(list3, list1.size(), pageSize,pageNum);
     }
 
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPlanDataVo.java

@@ -115,7 +115,7 @@ public class PatrolInspectionPlanDataVo implements Serializable {
     /**
      * 周数
      */
-    private String weekCount;
+    private Integer weekCount;
 
     /**
      * 子级列表