BJ_FS / urbanops

Commit 5ef0eb7e0fb85b0e1cf1d5f4a5114d41d233a32d

Authored by 王富生
1 parent 5b739d58

抢险任务提交update

Inline Side-by-side
Showing 3 changed files with 10 additions and 6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
  View file @5ef0eb7
... ... @@ -43,7 +43,7 @@ public class EmergencyTaskController {
43 43 @Operation(summary = "创建抢险任务主")
44 44 @PreAuthorize("@ss.hasPermission('garden:emergency-task:create')")
45 45 public CommonResult<Long> createEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO createReqVO) {
46   - return success(emergencyTaskService.createEmergencyTask(createReqVO));
  46 + return success(emergencyTaskService.createEmergencyTask(createReqVO, true));
47 47 }
48 48  
49 49 @PutMapping("/update")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java
  View file @5ef0eb7
... ... @@ -22,7 +22,7 @@ public interface EmergencyTaskService {
22 22 * @param createReqVO 创建信息
23 23 * @return 编号
24 24 */
25   - Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO);
  25 + Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO, boolean isSave);
26 26  
27 27 /**
28 28 * 集团审批
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
  View file @5ef0eb7
... ... @@ -58,7 +58,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
58 58  
59 59 @Transactional(rollbackFor = Exception.class)
60 60 @Override
61   - public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO) {
  61 + public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO, boolean isSave) {
62 62 String userId = SecurityFrameworkUtils.getLoginUserId() + "";
63 63 String userName = SecurityFrameworkUtils.getLoginUserNickname();
64 64 String taskNo = createReqVO.getTaskNo();
... ... @@ -94,7 +94,11 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
94 94 emergencyTask.setUpdater(userId);
95 95 emergencyTask.setUpdaterName(userName);
96 96 emergencyTask.setApprovalRemarks("");
97   - emergencyTaskMapper.insert(emergencyTask);
  97 + if(isSave){
  98 + emergencyTaskMapper.insert(emergencyTask);
  99 + }else{
  100 + emergencyTaskMapper.update(emergencyTask, new UpdateWrapper<EmergencyTaskDO>().eq("task_no", taskNo));
  101 + }
98 102  
99 103 List<EmergencyMachineryDO> list = new ArrayList<>();
100 104 String finalTaskNo = taskNo;
... ... @@ -139,8 +143,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
139 143 public void updateEmergencyTask(EmergencyTaskSaveReqVO updateReqVO) {
140 144 // 校验存在
141 145 validateEmergencyTaskExists(updateReqVO.getTaskNo());
142   - this.deleteEmergencyTaskByTaskNo(updateReqVO.getTaskNo());
143   - this.createEmergencyTask(updateReqVO);
  146 + emergencyMachineryMapper.deleteByTaskNo(updateReqVO.getTaskNo());
  147 + this.createEmergencyTask(updateReqVO, false);
144 148 }
145 149  
146 150 @Override
... ...