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

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

@@ -16,32 +16,22 @@ public interface MsCaseLogRecordMapper extends Mapper<MsCaseLogRecord> {
      */
     List<MsCaseLogRecord> selectCompleteByCreateBy(@Param("list") List<String> list);
 
-    @Select("<script> select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId," +
-            "    cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime, " +
-            "   CASE cl.case_node when 0 then '新增案件' " +
-            "when 1 then '提交案件' when 2 then '缴费'  " +
-            "   when 3 then '确认缴费' when 4 then '受理分配' when 5 then '选择调解员'  " +
-            "   when 6 then '核实调解员' when 7 then '确认调解员' when 8 then '确定调解时间'  " +
-            "   when 9 then '调解' when 10 then '确认调解书' when 11 then '签名'  " +
-            "   when 12 then '用印申请' when 13 then '用印' when 14 then '归档'  " +
-            "   when 15 then '签收' when 16 then '结束'   " +
-            "   ELSE '无案件状态'  " +
-            "   END content,  " +
-            "   CASE cl.case_node  when 1 then '申请人' when 2 then '申请人'  " +
-            "   when 3 then '财务' when 4 then '法律顾问' when 5 then '申请人'  " +
-            "   when 6 then '法律顾问' when 7 then '部门长' when 8 then '法律顾问'  " +
-            "   when 9 then '法律顾问'   when 10 then '申请人'   when 11 then '申请人'  " +
-            "   when 12 then '法律顾问' when 13 then '部门长' when 14 then '法律顾问'  " +
-            "   when 15 then '申请人' when 16 then '无角色'  " +
-            "   ELSE '无角色'  " +
-            "   END roleName  " +
-            "       from ms_case_log_record cl  " +
+    @Select("<script>  SELECT t.case_node caseNode,t.case_status_name caseStatusName,t.case_node_time caseNodeTime,t.notes, " +
+            "    t.id,t.case_appli_id caseAppliId,t.create_by createBy,t.create_nick_name createNickName, " +
+            "   t.create_time createTime,t.node_name content,sr.role_name  roleName  " +
+            "  FROM (select cl.case_node  ,cl.case_status_name ,cl.case_node_time  ,cl.notes  ,  " +
+            "   cl.id ,cl.case_appli_id ,cl.create_by ,cl.create_nick_name ,  " +
+            "   cl.create_time ,f.node_id ,f.id fid,f.node_name  " +
+            "   from ms_case_log_record cl  left join ms_case_flow f   " +
+            "   on cl.case_node  = f.node_id  " +
             "       <where>  " +
             "           <if test=\"caseLogRecord.caseAppliId != null and caseLogRecord.caseAppliId != ''\">" +
             "               AND cl.case_appli_id = #{caseLogRecord.caseAppliId}  " +
             "           </if>  " +
             "       </where>  " +
-            "       order by create_time asc  " +
+            "       order by create_time asc ) t   " +
+            "   left join ms_case_flow_role_related fr on fr.flow_id  = t.fid  " +
+            "   left join ms_sys_role sr on fr.roleid  = sr.role_id  " +
             " </script>")
     List<MsCaseLogRecordVO> selectCaseLogRecordList(@Param("caseLogRecord") MsCaseLogRecord caseLogRecord);
 

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

@@ -519,10 +519,12 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 if(record.getCreateTime()!=null){
                     caseNodeTime= DateUtil.format(record.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER);
                 }
-
+                Integer caseNode = record.getCaseNode();
                 contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
                 if(StrUtil.isNotEmpty(record.getContent())){
                     contentBuilder.append(record.getContent());
+                }else if(caseNode.intValue() == 0){
+                    contentBuilder.append(record.getCaseStatusName());
                 }
                 if(StrUtil.isNotEmpty(record.getNotes())){
                     contentBuilder.append("，").append(record.getNotes());