Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -79,7 +79,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         // 查询主表信息
         EquMaintenanceScheduleDo maintenanceSchedule = maintenanceScheduleService.getMaintenanceSiteByList(taskCreator);
         // 查询子表信息
-        Integer month = taskCreator.getMonth();
+        Integer month = Integer.parseInt(taskCreator.getMonth());
         List<EquMaintenancePartDo> maintenancePartList = maintenancePartService.getMasterIdAndMonthByList(maintenanceSchedule.getId(), month,null);
         // 查询是否有生成过任务
         List<EquMaintenanceTaskDo> maintenanceSiteList = maintenanceTaskService.getMaintenanceSite(taskCreator);
@@ -140,6 +140,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                                     .collect(Collectors.toList()).contains(info))
                             ).collect(Collectors.toList());
         }
+        if (equipmentId.size()==0){
+            return R.error("选中的设备已生成了"+batchCreate.getYear()+"年的计划！");
+        }
         List<AspCheckItems> aspCheckItems = new ArrayList<>(aspCheckItemsService.listByIds(equipmentId));
         List<EquMaintenanceScheduleDo> maintenanceScheduleList = aspCheckItems.stream().map(info -> {
             //数据转换（设备——计划）

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/dto/TaskCreatorDTO.java

@@ -1,7 +1,5 @@
 package com.rongwei.bsentity.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,7 +31,7 @@ public class TaskCreatorDTO implements Serializable {
     /**
      * 月份
      */
-    private Integer month;
+    private String month;
 
 
 }