提交修改

This commit is contained in:
quyixiao 2020-12-03 14:28:09 +08:00
parent b12a01e820
commit 377035a3e7

View File

@ -936,7 +936,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(),f.getFlowIndex());
for(FlowRecord flowRecord:flowRecords){
// 如果结果录入己经走了
if (new Integer(3).equals(flowRecord.getFlowProcess()) && (flowRecord.getStatus() == 1 || flowRecord.getStatus() == 4) ) {
if (new Integer(2).equals(flowRecord.getFlowProcess()) && (flowRecord.getStatus() == 1 || flowRecord.getStatus() == 4) ) {
flowRecord.setStatus(4); //表示流程己经被重置
}else{
flowRecord.setStatus(0); //表示流程己经被重置
@ -966,7 +966,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
for(FlowRecord f: flowRecords){
flowRecordIds.add(f.getId());
//如果录入己经走了则重置数据后结果录入还是默认己走
if (new Integer(3).equals(f.getFlowProcess()) && (f.getStatus() == 1 || f.getStatus() == 4 )) {
if (new Integer(2).equals(f.getFlowProcess()) && (f.getStatus() == 1 || f.getStatus() == 4 )) {
flag = true;
}
}
@ -977,7 +977,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i));
if(flag ){ //如果录入己经走了设置新的数据结果录入己走
FlowRecord newFlowRecord = newflowRecords.get(i) ;
if (new Integer(3).equals(newFlowRecord.getFlowProcess()) ) {
if (new Integer(2).equals(newFlowRecord.getFlowProcess()) ) {
newFlowRecord.setStatus(4);
flowRecordService.updateFlowRecordById(newFlowRecord);
}