|
|
@@ -462,6 +462,25 @@ public class MsSignSealServiceImpl implements MsSignSealService {
|
|
462
|
462
|
Integer caseFlowId = caseApplicationselect.getCaseFlowId();
|
|
463
|
463
|
MsCaseFlow msCaseFlow = caseFlowMapper.selectByPrimaryKey(caseFlowId);
|
|
464
|
464
|
|
|
|
465
|
+ List<MsCaseLogRecordVO> recordsNew = new ArrayList<>();
|
|
|
466
|
+ if (records != null && records.size() > 0) {
|
|
|
467
|
+ for (MsCaseLogRecordVO msCaseLogRecordVO : records) {
|
|
|
468
|
+ String content = msCaseLogRecordVO.getContent();
|
|
|
469
|
+ if(StringUtils.isNotEmpty(content)){
|
|
|
470
|
+ if(content.equals("结束")){
|
|
|
471
|
+ recordsNew.add(msCaseLogRecordVO);
|
|
|
472
|
+ }else {
|
|
|
473
|
+ if(!content.equals(msCaseFlow.getNodeName())){
|
|
|
474
|
+ recordsNew.add(msCaseLogRecordVO);
|
|
|
475
|
+ }else{
|
|
|
476
|
+ break;
|
|
|
477
|
+ }
|
|
|
478
|
+ }
|
|
|
479
|
+
|
|
|
480
|
+ }
|
|
|
481
|
+ }
|
|
|
482
|
+ }
|
|
|
483
|
+
|
|
465
|
484
|
CaseLogRecord caseLogRecordin = new CaseLogRecord();
|
|
466
|
485
|
List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
|
|
467
|
486
|
if(!"结束".equals(msCaseFlow.getNodeName())){
|
|
|
@@ -519,7 +538,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
|
|
519
|
538
|
}
|
|
520
|
539
|
|
|
521
|
540
|
}
|
|
522
|
|
- datas.put("finishCasenode", records);
|
|
|
541
|
+ datas.put("finishCasenode", recordsNew);
|
|
523
|
542
|
datas.put("inCasenode", caseLogRecordsin);
|
|
524
|
543
|
datas.put("nextCasenode", caseLogRecordsnext);
|
|
525
|
544
|
return success(datas);
|