wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-26 14:25:27 +08:00
parent dd3608be9e
commit 88368e4d03
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -1,5 +1,6 @@
package com.lz.modules.app.controller; package com.lz.modules.app.controller;
import com.alibaba.fastjson.JSONObject;
import com.lz.common.emun.WorkMsgTypeEnum; import com.lz.common.emun.WorkMsgTypeEnum;
import com.lz.common.utils.*; import com.lz.common.utils.*;
import com.lz.modules.app.dto.DepartmentsDto; import com.lz.modules.app.dto.DepartmentsDto;
@ -16,6 +17,7 @@ import com.lz.modules.flow.entity.RecordAuth;
import com.lz.modules.flow.entity.RecordFile; import com.lz.modules.flow.entity.RecordFile;
import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.entity.StaffRole;
import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.model.Auth;
import com.lz.modules.flow.model.StaffRoleDto;
import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.req.ResultDetailReq;
import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.flow.service.FlowRecordService;
import com.lz.modules.flow.service.RecordAuthService; import com.lz.modules.flow.service.RecordAuthService;
@ -308,6 +310,14 @@ public class ResultRecordController extends AbstractController {
if (flowRecord.getId().equals(req.getRollbackFlowId())) { if (flowRecord.getId().equals(req.getRollbackFlowId())) {
resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole()); resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole());
resultRecord.setStatus(req.getStatus()); resultRecord.setStatus(req.getStatus());
flowRecord.getFlowStaffIdRole();
List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class);
if (CollectionUtils.isNotEmpty(list)) {
StaffRoleDto staffRoleDto = list.get(0);
StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
}
resultRecordService.updateResultRecordById(resultRecord); resultRecordService.updateResultRecordById(resultRecord);
} }
if (flowRecord.getId() > req.getRollbackFlowId()) { if (flowRecord.getId() > req.getRollbackFlowId()) {

1
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -428,7 +428,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
resultRecord.setStatus(1); //审批中 resultRecord.setStatus(1); //审批中
resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null); resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null); resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
resultRecordService.updateResultRecordById(resultRecord);// 更新用户权限 resultRecordService.updateResultRecordById(resultRecord);// 更新用户权限
return R.ok("提交审批成功") return R.ok("提交审批成功")
.put("from", staff) .put("from", staff)