保养/维护计划 批量生成 后台传参更改

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

@@ -7,6 +7,7 @@ import com.rongwei.rwcommon.base.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author shangmi
@@ -19,12 +20,12 @@ public interface MaintenanceService  {
     /**
      * 发布任务
      *
-     * @param taskCreator 入参
+     * @param  入参
      * @return {@link R}
      * @date 2023/11/27 16:25
      * @author shangmi
      */
-    R saveTask(TaskCreatorDTO taskCreator) ;
+    R saveTask(List<TaskCreatorDTO> taskCreators) ;
 
     /**
      * 批量生成保养计划

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

@@ -12,7 +12,6 @@ import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.dto.BatchCreateDTO;
 import com.rongwei.bsentity.dto.PlanYearCopyDTO;
 import com.rongwei.bsentity.dto.TaskCreatorDTO;
-import com.rongwei.bsentity.enums.EquipmentTypeEnum;
 import com.rongwei.bsentity.enums.MaintenanceTypeEnum;
 import com.rongwei.bsentity.enums.PlannedStatusEnum;
 import com.rongwei.bsentity.enums.PlantEnum;
@@ -67,7 +66,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     /**
      * 发布任务
      *
-     * @param taskCreator 入参
+     * @param taskCreators 入参
      * @return {@link R}
      * @date 2023/11/27 16:25
      * @author shangmi
@@ -75,7 +74,10 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
     @Override
     @Transactional
-    public R saveTask(TaskCreatorDTO taskCreator) {
+    public R saveTask(List<TaskCreatorDTO> taskCreators) {
+
+       for(TaskCreatorDTO taskCreator:taskCreators){
+
         // 查询主表信息
         EquMaintenanceScheduleDo maintenanceSchedule = maintenanceScheduleService.getMaintenanceSiteByList(taskCreator);
         // 查询子表信息
@@ -104,11 +106,12 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         }
         maintenanceScheduleService.updatePlannedstatusByIds(Collections.singletonList(maintenanceSchedule.getId()), PlannedStatusEnum.PUBLISHED_TASK);
         // 判断是否全部插入成功
-        if (number == equMaintenanceTaskDos.size()) {
-            return R.ok();
-        } else {
-            return R.ok("数据添加不完整,请核对数据!");
+        if (number != equMaintenanceTaskDos.size()) {
+            return R.error("数据添加不完整,请核对数据!");
         }
+
+       }
+        return R.ok();
     }
 
     /**

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

@@ -13,6 +13,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * @author shangmi
  * @title MaintenanceController
@@ -31,16 +33,16 @@ public class MaintenanceController {
     /**
      * 发布任务
      *
-     * @param taskCreator 入参
+     * @param  入参
      * @return {@link R}
      * @date 2023/11/27 16:25
      * @author shangmi
      */
     @PostMapping("saveTask")
-    public R saveTask(@RequestBody TaskCreatorDTO taskCreator){
+    public R saveTask(@RequestBody List<TaskCreatorDTO> taskCreators){
         try {
-            log.info("进入接口：/maintenance/saveTask,入参：{}",taskCreator);
-            return maintenanceService.saveTask(taskCreator);
+            log.info("进入接口：/maintenance/saveTask,入参：{}",taskCreators);
+            return maintenanceService.saveTask(taskCreators);
         }catch (Exception e){
             ExceptionUtils.printExceptionDetail(e,"生成任务失败，请检查传入参数");
             return R.error(e.getMessage());