Browse Source

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

qtz 2 years ago
parent
commit
dbd0715c69

+ 10
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java View File

199
     /** 案件仲裁员 */
199
     /** 案件仲裁员 */
200
     private List<Arbitrator> arbitrators;
200
     private List<Arbitrator> arbitrators;
201
 
201
 
202
+    private List<Integer> caseStatusList;
203
+
204
+    public List<Integer> getCaseStatusList() {
205
+        return caseStatusList;
206
+    }
207
+
208
+    public void setCaseStatusList(List<Integer> caseStatusList) {
209
+        this.caseStatusList = caseStatusList;
210
+    }
211
+
202
     /** 仲裁记录 */
212
     /** 仲裁记录 */
203
     private ArbitrateRecord arbitrateRecord;
213
     private ArbitrateRecord arbitrateRecord;
204
 
214
 

+ 2
- 2
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml View File

23
         <if test="factDetermi != null and factDetermi != ''">fact_determi,</if>
23
         <if test="factDetermi != null and factDetermi != ''">fact_determi,</if>
24
         <if test="caseSketch != null and caseSketch != ''">case_sketch,</if>
24
         <if test="caseSketch != null and caseSketch != ''">case_sketch,</if>
25
         <if test="rulingFollows != null and rulingFollows != ''">ruling_follows,</if>
25
         <if test="rulingFollows != null and rulingFollows != ''">ruling_follows,</if>
26
-        <if test="verifica_opinion != null and verifica_opinion != ''">verificaOpinion,</if>
27
-        <if test="check_opinion != null and check_opinion != ''">checkOpinion,</if>
26
+        <if test="verificaOpinion != null and verificaOpinion != ''">verifica_opinion,</if>
27
+        <if test="checkOpinion != null and checkOpinion != ''">check_opinion,</if>
28
         <if test="createBy != null  and createBy != ''">create_by,</if>
28
         <if test="createBy != null  and createBy != ''">create_by,</if>
29
         create_time
29
         create_time
30
         )values(
30
         )values(

+ 6
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml View File

54
             <if test="caseNum != null and caseNum != ''">
54
             <if test="caseNum != null and caseNum != ''">
55
                 AND c.case_num = #{caseNum}
55
                 AND c.case_num = #{caseNum}
56
             </if>
56
             </if>
57
+            <if test="caseStatusList != null and caseStatusList.size() > 0">
58
+                and c.case_status in
59
+                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
60
+                    #{caseStatus}
61
+                </foreach>
62
+            </if>
57
         </where>
63
         </where>
58
     </select>
64
     </select>
59
 
65