Commit f0ef5b03c957ee27055daa8ab8c4e52e801b3a0b

Authored by 王富生
1 parent 57978475

抢险任务提交update

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
@@ -91,7 +91,7 @@ public class EmergencyTaskController { @@ -91,7 +91,7 @@ public class EmergencyTaskController {
91 91
92 @GetMapping("/page") 92 @GetMapping("/page")
93 @Operation(summary = "获得抢险任务主分页") 93 @Operation(summary = "获得抢险任务主分页")
94 - // @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')") 94 + @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
95 public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) { 95 public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) {
96 PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO); 96 PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO);
97 return success(pageResult); 97 return success(pageResult);
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
@@ -124,7 +124,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { @@ -124,7 +124,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
124 String userId = SecurityFrameworkUtils.getLoginUserId() + ""; 124 String userId = SecurityFrameworkUtils.getLoginUserId() + "";
125 String userName = SecurityFrameworkUtils.getLoginUserNickname(); 125 String userName = SecurityFrameworkUtils.getLoginUserNickname();
126 UpdateWrapper<EmergencyTaskDO> sqlWrapper = new UpdateWrapper<>(); 126 UpdateWrapper<EmergencyTaskDO> sqlWrapper = new UpdateWrapper<>();
127 - sqlWrapper.lambda().set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks()) 127 + sqlWrapper.lambda()
  128 + .set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks())
128 .set(EmergencyTaskDO::getApprovalUserId, userId) 129 .set(EmergencyTaskDO::getApprovalUserId, userId)
129 .set(EmergencyTaskDO::getApprovalUserName, userName) 130 .set(EmergencyTaskDO::getApprovalUserName, userName)
130 .set(EmergencyTaskDO::getBusiStatus, createReqVO.getBusiStatus()) 131 .set(EmergencyTaskDO::getBusiStatus, createReqVO.getBusiStatus())