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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java

@@ -31,6 +31,6 @@ public interface MsCaseLogRecordMapper extends Mapper<MsCaseLogRecord> {
         " </script>")
     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);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

@@ -465,12 +465,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
         List<MsCaseLogRecordVO> recordsNew = new ArrayList<>();
         if (records != null && records.size() > 0) {
             for (MsCaseLogRecordVO msCaseLogRecordVO : records) {
-                String content = msCaseLogRecordVO.getContent();
+//                String content = msCaseLogRecordVO.getContent();
+                String content = msCaseLogRecordVO.getCaseStatusName();
                 if(StringUtils.isNotEmpty(content)){
                     if(content.equals("结束")){
                         recordsNew.add(msCaseLogRecordVO);
                     }else {
-                        if(!content.equals(msCaseFlow.getNodeName())){
+                        if(!content.equals(msCaseFlow.getCaseStatusName())){
                             recordsNew.add(msCaseLogRecordVO);
                         }else{
                             break;