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-12-09 19:02:35 +08:00
parent 1f2d90857a
commit f95c279483
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,7 +968,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private R resetAll(ApprovalDto approvalDto) { private R resetAll(ApprovalDto approvalDto) {
FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId()); FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecord.getRecordId()); Long flowRecordId = approvalDto.getResultRecordId();
if(flowRecord != null ){
flowRecordId = flowRecord.getRecordId();
}
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
List<Long> flowRecordIds =new ArrayList<>(); List<Long> flowRecordIds =new ArrayList<>();
boolean flag = false ; boolean flag = false ;
for(FlowRecord f: flowRecords){ for(FlowRecord f: flowRecords){
@ -978,9 +982,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flag = true; flag = true;
} }
} }
flowRecordService.deleteFlowRecordByRecordId(flowRecord.getRecordId()); flowRecordService.deleteFlowRecordByRecordId(flowRecordId);
initFlowRecord(flowRecord.getRecordId()); initFlowRecord(flowRecordId);
List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecord.getRecordId()); List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
for(int i = 0 ;i < newflowRecords.size() ; i ++){ for(int i = 0 ;i < newflowRecords.size() ; i ++){
flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i)); flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i));
if(flag ){ //如果录入己经走了，设置新的数据，结果录入己走 if(flag ){ //如果录入己经走了，设置新的数据，结果录入己走
@ -991,7 +995,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} }
} }
} }
resultRecordService.resetData(flowRecord.getRecordId(),approvalDto.getClearFlag()); resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
return R.ok(); return R.ok();
} }