提交修改
This commit is contained in:
parent
e47e95aaa3
commit
d3924f5c24
@ -936,7 +936,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
|||||||
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(resultRecord.getRecordId(),resultRecord.getFlowIndex());
|
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(resultRecord.getRecordId(),resultRecord.getFlowIndex());
|
||||||
for(FlowRecord flowRecord:flowRecords){
|
for(FlowRecord flowRecord:flowRecords){
|
||||||
// 如果结果录入己经走了
|
// 如果结果录入己经走了
|
||||||
if (new Integer(3).equals(flowRecord.getFlowProcess()) && flowRecord.getStatus() == 1 ) {
|
if (new Integer(3).equals(flowRecord.getFlowProcess()) && (flowRecord.getStatus() == 1 || flowRecord.getStatus() == 4) ) {
|
||||||
flowRecord.setStatus(4); //表示流程己经被重置
|
flowRecord.setStatus(4); //表示流程己经被重置
|
||||||
}else{
|
}else{
|
||||||
flowRecord.setStatus(0); //表示流程己经被重置
|
flowRecord.setStatus(0); //表示流程己经被重置
|
||||||
@ -956,7 +956,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
|||||||
for(FlowRecord f: flowRecords){
|
for(FlowRecord f: flowRecords){
|
||||||
flowRecordIds.add(f.getId());
|
flowRecordIds.add(f.getId());
|
||||||
//如果录入己经走了,则重置数据后,结果录入还是默认己走
|
//如果录入己经走了,则重置数据后,结果录入还是默认己走
|
||||||
if (new Integer(3).equals(f.getFlowProcess()) && f.getStatus() == 1 ) {
|
if (new Integer(3).equals(f.getFlowProcess()) && (f.getStatus() == 1 || f.getStatus() == 4 )) {
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user