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 #85.
This commit is contained in:
qtz
2024-02-21 14:24:05 +08:00
committed by Gitea
parent 6ae4f4bec7 aa8522293f
commit 657df6d9a5
1 changed files with 18 additions and 7 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
+18 -7
View File
@@ -471,13 +471,17 @@ public class MsSignSealServiceImpl implements MsSignSealService {
caseLogRecordin.setContent(roleIn.toString().substring(0,roleIn.toString().length()-1));
MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseFlowId);
List<MsCaseFlowVO> nextMsCaseFlowvo = caseFlowMapper.selectFlowRole(nextFlow.getId());
StringBuilder roleIn1 = new StringBuilder();
for(MsCaseFlowVO mscaseFlowVO:nextMsCaseFlowvo){
roleIn1.append( mscaseFlowVO.getRoleName()+";");
String nodeName = nextFlow.getNodeName();
if(StringUtils.isNotEmpty(nodeName)){
if(!"结束".equals(nodeName)){
List<MsCaseFlowVO> nextMsCaseFlowvo = caseFlowMapper.selectFlowRole(nextFlow.getId());
StringBuilder roleIn1 = new StringBuilder();
for(MsCaseFlowVO mscaseFlowVO:nextMsCaseFlowvo){
roleIn1.append( mscaseFlowVO.getRoleName()+";");
}
caseLogRecordin.setNextRoleName("下一节点角色："+roleIn1.toString().substring(0,roleIn1.toString().length()-1));
}
}
caseLogRecordin.setNextRoleName("下一节点角色："+roleIn1.toString().substring(0,roleIn1.toString().length()-1));
MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
@@ -493,7 +497,14 @@ public class MsSignSealServiceImpl implements MsSignSealService {
StringBuilder rolenext = new StringBuilder();
for(MsCaseFlowVO mscaseFlowVO:msCaseFlowVOs){
rolenext.append( mscaseFlowVO.getRoleName()+"将进行"+mscaseFlowVO.getNodeName()+";");
String nodeName1 = mscaseFlowVO.getNodeName();
if(StringUtils.isNotEmpty(nodeName1)){
if("结束".equals(nodeName1)){
rolenext.append("结束;");
}else {
rolenext.append( mscaseFlowVO.getRoleName()+"将进行"+mscaseFlowVO.getNodeName()+";");
}
}
}
caseLogRecord1.setContent( rolenext.toString().substring(0,rolenext.toString().length()-1));
caseLogRecordsnext.add(caseLogRecord1);