Commit a12e2f4096783457beb52c3c6e14fd46bc32b837

Authored by 王富生
1 parent d03c7196

抢险任务提交update

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
@@ -144,6 +144,7 @@ public class EmergencyTaskController { @@ -144,6 +144,7 @@ public class EmergencyTaskController {
144 emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks()); 144 emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks());
145 emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName()); 145 emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName());
146 emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime()); 146 emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime());
  147 + emergencyTaskExcleRespVO.setUpdaterName(emergencyTask.getUpdaterName());
147 List<String> machineryList = new ArrayList<>(); 148 List<String> machineryList = new ArrayList<>();
148 if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){ 149 if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){
149 emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList()); 150 emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList());
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
@@ -89,12 +89,12 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { @@ -89,12 +89,12 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
89 emergencyTask.setStatus(createReqVO.getStatus()); 89 emergencyTask.setStatus(createReqVO.getStatus());
90 emergencyTask.setCompanyId(companyId); 90 emergencyTask.setCompanyId(companyId);
91 emergencyTask.setDeptId(deptId); 91 emergencyTask.setDeptId(deptId);
92 - emergencyTask.setCreator(userId);  
93 - emergencyTask.setCreatorName(userName);  
94 emergencyTask.setUpdater(userId); 92 emergencyTask.setUpdater(userId);
95 emergencyTask.setUpdaterName(userName); 93 emergencyTask.setUpdaterName(userName);
96 emergencyTask.setApprovalRemarks(""); 94 emergencyTask.setApprovalRemarks("");
97 if(isSave){ 95 if(isSave){
  96 + emergencyTask.setCreator(userId);
  97 + emergencyTask.setCreatorName(userName);
98 emergencyTaskMapper.insert(emergencyTask); 98 emergencyTaskMapper.insert(emergencyTask);
99 }else{ 99 }else{
100 emergencyTaskMapper.update(emergencyTask, new UpdateWrapper<EmergencyTaskDO>().eq("task_no", taskNo)); 100 emergencyTaskMapper.update(emergencyTask, new UpdateWrapper<EmergencyTaskDO>().eq("task_no", taskNo));