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

修改返回的提醒内容

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

@@ -85,7 +85,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         List<EquMaintenanceTaskDo> maintenanceSiteList = maintenanceTaskService.getMaintenanceSite(taskCreator);
         // 判断所有部位是否都有生成过任务
         if (maintenanceSiteList.size() == maintenancePartList.size()) {
-            return R.error(maintenanceSchedule.getEquipmentname() + "在" + taskCreator.getYear() + "年" + month + "月的所有部位已发布任务！");
+            return R.error(maintenanceSchedule.getEquipmentname() + "在" + taskCreator.getYear() + "年" + month + "月的所有部位已发布任务或没有可发布的任务！");
         }
         // 任务表没有数据则全部添加
         if (maintenanceSiteList.size() != 0) {
@@ -99,7 +99,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         List<EquPartsSetoutTaskDo> partsSetoutTaskDoList = sparePartsConversion(partsSetoutStandardList, equMaintenanceTaskDos);
         // 插入
         int number = maintenanceTaskService.insertBatch(equMaintenanceTaskDos);
-        partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
+        if(partsSetoutTaskDoList.size()!=0){
+            partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
+        }
         maintenanceScheduleService.updatePlannedstatusByIds(Collections.singletonList(maintenanceSchedule.getId()), PlannedStatusEnum.PUBLISHED_TASK);
         // 判断是否全部插入成功
         if (number == equMaintenanceTaskDos.size()){
@@ -426,25 +428,25 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             SysSerialVo sysSerialVo = new SysSerialVo();
             sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_BC");
             sysSerialVo.setResetrule("date:yyyy");
-            sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])+"-"+maintenanceSchedule.getPlantype()+"-@{serialNumber:#00000}");
-            R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
+            // sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])+"-"+maintenanceSchedule.getPlantype()+"-@{serialNumber:#00000}");
+            // R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
             EquMaintenanceTaskDo equMaintenanceTask = new EquMaintenanceTaskDo();
             BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
             BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
             equMaintenanceTask.setId(SecurityUtil.getUUID())
                     .setMonth(month)
-                    .setCreateuserid(currentUser.getId())
-                    .setCreateusername(currentUser.getName())
+                    // .setCreateuserid(currentUser.getId())
+                    // .setCreateusername(currentUser.getName())
                     .setCreatedate(newDate)
-                    .setModifyuserid(currentUser.getId())
-                    .setModifyusername(currentUser.getName())
-                    .setModifydate(newDate)
-                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
-            if ("200".equals(serialNumberCode.getCode())){
-
-                Object data = serialNumberCode.getData();
-                equMaintenanceTask.setTaskid(JSONObject.parseObject(JSONObject.toJSONString(data),Map.class).get("code").toString());
-            }
+                    // .setModifyuserid(currentUser.getId())
+                    // .setModifyusername(currentUser.getName())
+                    .setModifydate(newDate);
+                    // .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+            // if ("200".equals(serialNumberCode.getCode())){
+            //
+            //     Object data = serialNumberCode.getData();
+            //     equMaintenanceTask.setTaskid(JSONObject.parseObject(JSONObject.toJSONString(data),Map.class).get("code").toString());
+            // }
             maintenanceTaskList.add(equMaintenanceTask);
         }
 

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/MaintenanceController.java

@@ -45,7 +45,7 @@ public class MaintenanceController {
             log.info("进入接口：/maintenance/batchSavePlans,入参：{}",batchCreate);
             return maintenanceService.batchSavePlans(batchCreate);
         }catch (Exception e){
-            ExceptionUtils.printExceptionDetail(e,"生成任务失败，请检查传入参数，问题为：");
+            ExceptionUtils.printExceptionDetail(e,"批量生成保养计划失败，请检查传入参数，问题为：");
             return R.error(e.getMessage());
         }