diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java index 7af7699..f428e70 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java @@ -43,7 +43,7 @@ public class EmergencyTaskController { @Operation(summary = "创建抢险任务主") @PreAuthorize("@ss.hasPermission('garden:emergency-task:create')") public CommonResult createEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO createReqVO) { - return success(emergencyTaskService.createEmergencyTask(createReqVO)); + return success(emergencyTaskService.createEmergencyTask(createReqVO, true)); } @PutMapping("/update") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java index 0f0a41b..c242f2c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java @@ -22,7 +22,7 @@ public interface EmergencyTaskService { * @param createReqVO 创建信息 * @return 编号 */ - Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO); + Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO, boolean isSave); /** * 集团审批 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 0c80d6f..0b1584b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java @@ -58,7 +58,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { @Transactional(rollbackFor = Exception.class) @Override - public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO) { + public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO, boolean isSave) { String userId = SecurityFrameworkUtils.getLoginUserId() + ""; String userName = SecurityFrameworkUtils.getLoginUserNickname(); String taskNo = createReqVO.getTaskNo(); @@ -94,7 +94,11 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { emergencyTask.setUpdater(userId); emergencyTask.setUpdaterName(userName); emergencyTask.setApprovalRemarks(""); - emergencyTaskMapper.insert(emergencyTask); + if(isSave){ + emergencyTaskMapper.insert(emergencyTask); + }else{ + emergencyTaskMapper.update(emergencyTask, new UpdateWrapper().eq("task_no", taskNo)); + } List list = new ArrayList<>(); String finalTaskNo = taskNo; @@ -139,8 +143,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { public void updateEmergencyTask(EmergencyTaskSaveReqVO updateReqVO) { // 校验存在 validateEmergencyTaskExists(updateReqVO.getTaskNo()); - this.deleteEmergencyTaskByTaskNo(updateReqVO.getTaskNo()); - this.createEmergencyTask(updateReqVO); + emergencyMachineryMapper.deleteByTaskNo(updateReqVO.getTaskNo()); + this.createEmergencyTask(updateReqVO, false); } @Override