qitz 2 лет назад
Родитель
Сommit
657e748cb3

+ 13
- 17
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java Просмотреть файл

@@ -16,23 +16,19 @@ public interface MsCaseLogRecordMapper extends Mapper<MsCaseLogRecord> {
16 16
      */
17 17
     List<MsCaseLogRecord> selectCompleteByCreateBy(@Param("list") List<String> list);
18 18
 
19
-    @Select("<script>  SELECT t.case_node caseNode,t.case_status_name caseStatusName,t.case_node_time caseNodeTime,t.notes, " +
20
-            "    t.id,t.case_appli_id caseAppliId,t.create_by createBy,t.create_nick_name createNickName, " +
21
-            "   t.create_time createTime,t.node_name content,sr.role_name  roleName  " +
22
-            "  FROM (select cl.case_node  ,cl.case_status_name ,cl.case_node_time  ,cl.notes  ,  " +
23
-            "   cl.id ,cl.case_appli_id ,cl.create_by ,cl.create_nick_name ,  " +
24
-            "   cl.create_time ,f.node_id ,f.id fid,f.node_name  " +
25
-            "   from ms_case_log_record cl  left join ms_case_flow f   " +
26
-            "   on cl.case_node  = f.node_id  " +
27
-            "       <where>  " +
28
-            "           <if test=\"caseLogRecord.caseAppliId != null and caseLogRecord.caseAppliId != ''\">" +
29
-            "               AND cl.case_appli_id = #{caseLogRecord.caseAppliId}  " +
30
-            "           </if>  " +
31
-            "       </where>  " +
32
-            "       order by create_time asc ) t   " +
33
-            "   left join ms_case_flow_role_related fr on fr.flow_id  = t.fid  " +
34
-            "   left join ms_sys_role sr on fr.roleid  = sr.role_id  " +
35
-            " </script>")
19
+
20
+        @Select("<script>  select cl.case_node caseNode  ,cl.case_status_name caseStatusName ,cl.case_node_time caseNodeTime  , cl.notes  ,   " +
21
+        "   cl.id ,cl.case_appli_id caseAppliId ,cl.create_by  createBy ,cl.create_nick_name createNickName,  " +
22
+        "   cl.create_time createTime ,f.node_name content " +
23
+        "   from ms_case_log_record cl  left join ms_case_flow f   " +
24
+        "   on cl.case_node  = f.node_id  " +
25
+        "       <where>  " +
26
+        "           <if test=\"caseLogRecord.caseAppliId != null and caseLogRecord.caseAppliId != ''\">" +
27
+        "               AND cl.case_appli_id = #{caseLogRecord.caseAppliId}  " +
28
+        "           </if>  " +
29
+        "       </where>  " +
30
+        "       order by create_time asc   " +
31
+        " </script>")
36 32
     List<MsCaseLogRecordVO> selectCaseLogRecordList(@Param("caseLogRecord") MsCaseLogRecord caseLogRecord);
37 33
 
38 34
     @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 ")