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-10-27 15:44:42 +08:00
parent 184cd5d8e6
commit 64d336dd5f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,6 +674,7 @@ public class ResultRecordController extends AbstractController {
*/ */
// 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&loginUserId=825&comment=xxx&menuName=bbb // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&loginUserId=825&comment=xxx&menuName=bbb
// 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360 // 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360
// 转交：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=8&menuName=bbb&flowRecordId=360&transferStaffId=294
@RequestMapping("/new/approval") @RequestMapping("/new/approval")
public R approval(ApprovalDto approvalDto) { public R approval(ApprovalDto approvalDto) {
try { try {

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

@ -889,11 +889,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private R transfer(ApprovalDto approvalDto) { private R transfer(ApprovalDto approvalDto) {
FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId()); FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
flowChangeService.saveChange(approvalDto, flowRecord, 1);
StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getTransferStaffId()); StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getTransferStaffId());
flowRecord.setApprovalStaffId(staffEntity.getId()); flowRecord.setApprovalStaffId(staffEntity.getId());
flowRecord.setApprovalStaffName(staffEntity.getName()); flowRecord.setApprovalStaffName(staffEntity.getName());
flowChangeService.saveChange(approvalDto, flowRecord, 1); flowRecordService.updateFlowRecordById(flowRecord);
return R.ok("跳过成功"); return R.ok("转交成功");
} }