提交修改
This commit is contained in:
parent
3e14c8a254
commit
e47e95aaa3
@ -299,7 +299,7 @@ public class TestController {
|
|||||||
System.out.println(roleIds);
|
System.out.println(roleIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
//http://localhost:8080/lz_management/test/reset/data?resultRecordId=3714
|
//http://localhost:8080/lz_management/test/reset/data?resultRecordId=3682
|
||||||
@RequestMapping("/test/reset/data")
|
@RequestMapping("/test/reset/data")
|
||||||
public R getResetData(RecordDetailDto recordDetailDto) {
|
public R getResetData(RecordDetailDto recordDetailDto) {
|
||||||
return resultRecordService.getResetData(recordDetailDto);
|
return resultRecordService.getResetData(recordDetailDto);
|
||||||
|
|||||||
@ -937,9 +937,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
|||||||
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 ) {
|
||||||
continue;
|
flowRecord.setStatus(4); //表示流程己经被重置
|
||||||
}
|
}else{
|
||||||
flowRecord.setStatus(0); //表示流程己经被重置
|
flowRecord.setStatus(0); //表示流程己经被重置
|
||||||
|
}
|
||||||
|
|
||||||
flowRecordService.updateFlowRecordById(flowRecord);
|
flowRecordService.updateFlowRecordById(flowRecord);
|
||||||
}
|
}
|
||||||
return R.ok();
|
return R.ok();
|
||||||
@ -966,7 +968,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
|||||||
if(flag ){ //如果录入己经走了,设置新的数据,结果录入己走
|
if(flag ){ //如果录入己经走了,设置新的数据,结果录入己走
|
||||||
FlowRecord newFlowRecord = newflowRecords.get(i) ;
|
FlowRecord newFlowRecord = newflowRecords.get(i) ;
|
||||||
if (new Integer(3).equals(newFlowRecord.getFlowProcess()) ) {
|
if (new Integer(3).equals(newFlowRecord.getFlowProcess()) ) {
|
||||||
newFlowRecord.setStatus(1);
|
newFlowRecord.setStatus(4);
|
||||||
flowRecordService.updateFlowRecordById(newFlowRecord);
|
flowRecordService.updateFlowRecordById(newFlowRecord);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user