设备子系统———testin421bug修复

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

@@ -300,6 +300,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setCreatedate(date)
                     .setModifydate(date)
                     .setCreateuserid(currentUser.getId())
+                    .setCreateusername(currentUser.getName())
+                    .setModifyusername(currentUser.getName())
                     .setModifyuserid(currentUser.getId());
         }
         maintenanceStandardService.saveBatch(newMaintenanceStandardList, 200);
@@ -378,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(info.getMaintenancetype()) + "-" + info.getMaintenancesite() + "部位" + info.getMaintenancecontext() + "的保养标准内容，不可重复导入，请检查");
+            errorData.add(PlantEnum.nameOf(info.getTenantid()) + ",已存在了" + "-" + MaintenanceTypeEnum.typeOf(info.getMaintenancetype()) + "-" + info.getMaintenancesite() + "部位" + info.getMaintenancecontext() + "的保养标准内容，不可重复导入，请检查");
         });
 
     }