Explorar el Código

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

wangqiong123 hace 2 años
padre
commit
6285269078

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Ver fichero

141
             }
141
             }
142
         }
142
         }
143
         List<Integer> caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI);
143
         List<Integer> caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI);
144
-        return getCaseEvidenceVOList(identityNum, caseStatusList, null);
144
+        return getCaseEvidenceVOList(identityNum, caseStatusList, 2);
145
     }
145
     }
146
 
146
 
147
     @Override
147
     @Override

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml Ver fichero

30
         when 12 then '核验裁决书' when 13 then '同意裁决书' when 14 then '签名成功'
30
         when 12 then '核验裁决书' when 13 then '同意裁决书' when 14 then '签名成功'
31
         when 15 then '用印成功' when 16 then '送达仲裁文书' when 17 then '案件归档'
31
         when 15 then '用印成功' when 16 then '送达仲裁文书' when 17 then '案件归档'
32
         when 26 then '证据确认成功'
32
         when 26 then '证据确认成功'
33
+        when 31 then '修改开庭时间'
33
         ELSE '无案件状态'
34
         ELSE '无案件状态'
34
         END content,
35
         END content,
35
         CASE cl.case_node when 0 then '申请人' when 1 then '申请人' when 2 then '法律顾问'
36
         CASE cl.case_node when 0 then '申请人' when 1 then '申请人' when 2 then '法律顾问'