项目打印列表添加当前月份天数

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MaintenancePlanPrintResponse.java

@@ -48,4 +48,8 @@ public class MaintenancePlanPrintResponse {
      * 打印时间
      */
     private LocalDateTime printTime = LocalDateTime.now();
+    /**
+     * 当前月份天数
+     */
+    private Integer monthDay;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -399,14 +399,14 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
 
         //组装电梯列表中的维保计划数据
         for (LiftPrintResponse entry : liftList) {
-            List<Map<String,Object>> plans = new ArrayList<>();
+            List<Map<String, Object>> plans = new ArrayList<>();
             for (MaintenancePlan plan : planList) {
                 if (entry.getProjectId().equals(plan.getProjectId())
                         && entry.getLiftId().equals(plan.getLiftId())
-                        && entry.getMtCompanyId().equals(plan.getMtCompanyId())){
-                    Map<String,Object> map = new HashMap<>();
-                    map.put("planDate",plan.getPlanDate());
-                    map.put("type",plan.getType());
+                        && entry.getMtCompanyId().equals(plan.getMtCompanyId())) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("planDate", plan.getPlanDate());
+                    map.put("type", plan.getType());
                     plans.add(map);
                 }
             }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectPrintRequest.java

@@ -27,5 +27,6 @@ public class ProjectPrintRequest {
     /**
      * 当前年月日
      */
+    @NotNull(message = "notEmpty")
     private LocalDate beginTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -304,6 +304,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2020/3/2 4:54 下午
      */
     public MaintenancePlanPrintResponse planPrint(ProjectPrintRequest request) {
+        Integer monthDay = request.getBeginTime().lengthOfMonth();
         //根据项目id查询项目详情
         MaintenancePlanPrintResponse project = baseMapper.findProjectByIdAndCompanyId(request);
 
@@ -312,9 +313,10 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
 
         List<Long> liftIdList = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
         //根据公司id和电梯id列表查询维保计划列表
-        List<LiftPrintResponse> liftMaintenancePlanList = maintenancePlanService.getLiftMaintenancePlanList(request.getMtCompanyId(), liftIdList,request.getBeginTime());
+        List<LiftPrintResponse> liftMaintenancePlanList = maintenancePlanService.getLiftMaintenancePlanList(request.getMtCompanyId(), liftIdList, request.getBeginTime());
         project.setLiftList(liftMaintenancePlanList);
         project.setNum(liftList.size());
+        project.setMonthDay(monthDay);
         return project;
     }