Prechádzať zdrojové kódy

设备之系统——保养检修 BUG
保养标准导入时字符类型出错导致的报错

hyq 1 rok pred
rodič
commit
c539f69eb7

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

@@ -380,7 +380,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
     public void jointErrorData(List<EquMaintenanceStandardDo> maintenanceStandardList,List<String> errorData){
         maintenanceStandardList.forEach(info ->{
-            errorData.add(PlantEnum.nameOf(info.getTenantid())+",已存在了"+EquipmentTypeEnum.typeOf(Integer.valueOf(info.getEquipmenttype()))+"-"+MaintenanceTypeEnum.typeOf(Integer.valueOf(info.getMaintenancetype()))+"-"+info.getMaintenancesite()+"部位"+info.getMaintenancecontext()+"的保养标准内容,不可重复导入,请检查");
+            errorData.add(PlantEnum.nameOf(info.getTenantid())+",已存在了"+EquipmentTypeEnum.typeOf(Integer.valueOf(info.getEquipmenttype()))+"-"+MaintenanceTypeEnum.typeOf(info.getMaintenancetype())+"-"+info.getMaintenancesite()+"部位"+info.getMaintenancecontext()+"的保养标准内容,不可重复导入,请检查");
         });
 
     }

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

@@ -23,7 +23,7 @@ public enum MaintenanceTypeEnum {
         this.type = type;
     }
 
-    public static String  typeOf(Integer message){
+    public static String  typeOf(String message){
         return getMessageByType(message,null).type;
     }
 
@@ -31,7 +31,7 @@ public enum MaintenanceTypeEnum {
         return getTypeByMessage(type,null).message;
     }
 
-    public static MaintenanceTypeEnum getMessageByType(Integer message,MaintenanceTypeEnum maintenanceTypeEnum){
+    public static MaintenanceTypeEnum getMessageByType(String message,MaintenanceTypeEnum maintenanceTypeEnum){
         return Arrays.stream(values()).filter(info -> Objects.equals(info.message, message)).findFirst().orElse(maintenanceTypeEnum);
     }