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 #104.
This commit is contained in:
qtz
2024-02-29 17:59:59 +08:00
committed by Gitea
parent 988e763abd 134c5b880a
commit dc95793394
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java
+1 -1
View File
@@ -31,6 +31,6 @@ public interface MsCaseLogRecordMapper extends Mapper<MsCaseLogRecord> {
" </script>") " </script>")
List<MsCaseLogRecordVO> selectCaseLogRecordList(@Param("caseLogRecord") MsCaseLogRecord caseLogRecord); List<MsCaseLogRecordVO> selectCaseLogRecordList(@Param("caseLogRecord") MsCaseLogRecord caseLogRecord);
@Select("SELECT group_concat( DISTINCT t.createNickName) createNickName,t.nodeName content,t.nodeId,t.sort FROM (SELECT l.create_nick_name createNickName ,f.node_name nodeName,f.node_id nodeId, f.sort FROM ms_case_log_record l left join ms_case_flow f on l.case_node = f.node_id WHERE l.case_appli_id = #{caseAppliId} and f.node_name is not null ) t group by t.nodeName,t.nodeId,t.sort order by t.sort ") @Select("SELECT group_concat( DISTINCT t.createNickName) createNickName,t.nodeName content,t.nodeId,t.sort ,t.caseStatusName FROM (SELECT l.create_nick_name createNickName ,f.node_name nodeName,f.node_id nodeId, f.sort, f.case_status_name caseStatusName FROM ms_case_log_record l left join ms_case_flow f on l.case_node = f.node_id WHERE l.case_appli_id = #{caseAppliId} and f.node_name is not null ) t group by t.nodeName,t.nodeId,t.sort ,t.caseStatusName order by t.sort ")
List<MsCaseLogRecordVO> selectCaseLogRecordListCaseProgress(Long caseAppliId); List<MsCaseLogRecordVO> selectCaseLogRecordListCaseProgress(Long caseAppliId);
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+3 -2
View File
@@ -465,12 +465,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
List<MsCaseLogRecordVO> recordsNew = new ArrayList<>(); List<MsCaseLogRecordVO> recordsNew = new ArrayList<>();
if (records != null && records.size() > 0) { if (records != null && records.size() > 0) {
for (MsCaseLogRecordVO msCaseLogRecordVO : records) { for (MsCaseLogRecordVO msCaseLogRecordVO : records) {
String content = msCaseLogRecordVO.getContent(); // String content = msCaseLogRecordVO.getContent();
String content = msCaseLogRecordVO.getCaseStatusName();
if(StringUtils.isNotEmpty(content)){ if(StringUtils.isNotEmpty(content)){
if(content.equals("结束")){ if(content.equals("结束")){
recordsNew.add(msCaseLogRecordVO); recordsNew.add(msCaseLogRecordVO);
}else { }else {
if(!content.equals(msCaseFlow.getNodeName())){ if(!content.equals(msCaseFlow.getCaseStatusName())){
recordsNew.add(msCaseLogRecordVO); recordsNew.add(msCaseLogRecordVO);
}else{ }else{
break; break;