SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #95.
This commit is contained in:
qtz
2024-02-26 14:34:42 +08:00
committed by Gitea
parent ce307a7912 ef5f37d83a
commit e2bf519221
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+20 -1
View File
@@ -462,6 +462,25 @@ public class MsSignSealServiceImpl implements MsSignSealService {
Integer caseFlowId = caseApplicationselect.getCaseFlowId(); Integer caseFlowId = caseApplicationselect.getCaseFlowId();
MsCaseFlow msCaseFlow = caseFlowMapper.selectByPrimaryKey(caseFlowId); MsCaseFlow msCaseFlow = caseFlowMapper.selectByPrimaryKey(caseFlowId);
List<MsCaseLogRecordVO> recordsNew = new ArrayList<>();
if (records != null && records.size() > 0) {
for (MsCaseLogRecordVO msCaseLogRecordVO : records) {
String content = msCaseLogRecordVO.getContent();
if(StringUtils.isNotEmpty(content)){
if(content.equals("结束")){
recordsNew.add(msCaseLogRecordVO);
}else {
if(!content.equals(msCaseFlow.getNodeName())){
recordsNew.add(msCaseLogRecordVO);
}else{
break;
}
}
}
}
}
CaseLogRecord caseLogRecordin = new CaseLogRecord(); CaseLogRecord caseLogRecordin = new CaseLogRecord();
List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>(); List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
if(!"结束".equals(msCaseFlow.getNodeName())){ if(!"结束".equals(msCaseFlow.getNodeName())){
@@ -519,7 +538,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
} }
} }
datas.put("finishCasenode", records); datas.put("finishCasenode", recordsNew);
datas.put("inCasenode", caseLogRecordsin); datas.put("inCasenode", caseLogRecordsin);
datas.put("nextCasenode", caseLogRecordsnext); datas.put("nextCasenode", caseLogRecordsnext);
return success(datas); return success(datas);