设备之系统——保养检修 BUG

导入时的枚举类修改以及添加planMonth字段

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/config/EquMaintenanceStandardListener.java

@@ -75,6 +75,7 @@ public class EquMaintenanceStandardListener extends AnalysisEventListener<EquMai
 
     private EquMaintenanceStandardDo migrateDate(EquMaintenanceStandardTemplate equMaintenanceStandardTemplate) {
         Date date = new Date();
+        StringBuilder planMonth = new StringBuilder();
         SysUserVo currentUser = CommonUtils.getCurrentUser();
         EquMaintenanceStandardDo equMaintenanceStandardDo = new EquMaintenanceStandardDo();
         BeanUtils.copyProperties(equMaintenanceStandardTemplate, equMaintenanceStandardDo);
@@ -89,19 +90,56 @@ public class EquMaintenanceStandardListener extends AnalysisEventListener<EquMai
                 .setCreateuserid(currentUser.getId())
                 .setModifyusername(currentUser.getName())
                 .setModifyuserid(currentUser.getId())
-                .setIsoutsource(String.valueOf("是".equals(equMaintenanceStandardTemplate.getIsoutsource()) ? 0 : 1))
-                .setJan("是".equals(equMaintenanceStandardTemplate.getJan()) ? 1 : null)
-                .setFeb("是".equals(equMaintenanceStandardTemplate.getFeb()) ? 1 : null)
-                .setMar("是".equals(equMaintenanceStandardTemplate.getMar()) ? 1 : null)
-                .setApr("是".equals(equMaintenanceStandardTemplate.getApr()) ? 1 : null)
-                .setMay("是".equals(equMaintenanceStandardTemplate.getMay()) ? 1 : null)
-                .setJun("是".equals(equMaintenanceStandardTemplate.getJun()) ? 1 : null)
-                .setJul("是".equals(equMaintenanceStandardTemplate.getJul()) ? 1 : null)
-                .setAug("是".equals(equMaintenanceStandardTemplate.getAug()) ? 1 : null)
-                .setSep("是".equals(equMaintenanceStandardTemplate.getSep()) ? 1 : null)
-                .setOct("是".equals(equMaintenanceStandardTemplate.getOct()) ? 1 : null)
-                .setNov("是".equals(equMaintenanceStandardTemplate.getNov()) ? 1 : null)
-                .setDecember("是".equals(equMaintenanceStandardTemplate.getDecember()) ? 1 : null);
+                .setIsoutsource(String.valueOf("是".equals(equMaintenanceStandardTemplate.getIsoutsource()) ? 0 : 1));
+        if("是".equals(equMaintenanceStandardTemplate.getJan()) ){
+            equMaintenanceStandardDo.setJan(1);
+            planMonth.append("JAN");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getFeb()) ){
+            equMaintenanceStandardDo.setFeb(1);
+            planMonth.append(",FEB");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getMar()) ){
+            equMaintenanceStandardDo.setMar(1);
+            planMonth.append(",MAR");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getApr()) ){
+            equMaintenanceStandardDo.setApr(1);
+            planMonth.append(",APR");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getMay()) ){
+            equMaintenanceStandardDo.setMay(1);
+            planMonth.append(",MAY");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getJun()) ){
+            equMaintenanceStandardDo.setJun(1);
+            planMonth.append(",JUN");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getJul()) ){
+            equMaintenanceStandardDo.setJul(1);
+            planMonth.append(",JUL");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getAug()) ){
+            equMaintenanceStandardDo.setAug(1);
+            planMonth.append(",AUG");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getSep()) ){
+            equMaintenanceStandardDo.setSep(1);
+            planMonth.append(",SEP");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getOct()) ){
+            equMaintenanceStandardDo.setOct(1);
+            planMonth.append(",OCT");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getNov()) ){
+            equMaintenanceStandardDo.setNov(1);
+            planMonth.append(",NOV");
+        }
+        if("是".equals(equMaintenanceStandardTemplate.getDecember()) ){
+            equMaintenanceStandardDo.setDecember(1);
+            planMonth.append(",DEC");
+        }
+        equMaintenanceStandardDo.setPlanMonth(planMonth.toString());
         return equMaintenanceStandardDo;
     }
 }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquMaintenanceStandardDo.java

@@ -1,9 +1,9 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -260,4 +260,11 @@ public class EquMaintenanceStandardDo implements Serializable {
 	 */
 	private Integer december;
 
+	/**
+	 * table name:PLANMONTH
+	 * table type:varchar
+	 * table comment:12月
+	 */
+	private String planMonth;
+
 }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/enums/MaintenanceTypeEnum.java

@@ -10,7 +10,7 @@ import java.util.Objects;
  * @description 保养分类数据字典
  */
 public enum MaintenanceTypeEnum {
-    MECHANICAL_OVERHAUL("机械检修","jj"),
+    MECHANICAL_OVERHAUL("机械检修","JJ"),
     ELECTRICAL_REPAIR("电气检修","DJ"),
     ENGINE_ATTENDANCE("机械保养","JY"),
     ELECTRICAL_MAINTENANCE("电气保养","DY")