Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -199,6 +199,16 @@ public class CaseApplication  extends BaseEntity {
     /** 案件仲裁员 */
     private List<Arbitrator> arbitrators;
 
+    private List<Integer> caseStatusList;
+
+    public List<Integer> getCaseStatusList() {
+        return caseStatusList;
+    }
+
+    public void setCaseStatusList(List<Integer> caseStatusList) {
+        this.caseStatusList = caseStatusList;
+    }
+
     /** 仲裁记录 */
     private ArbitrateRecord arbitrateRecord;
 

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml

@@ -23,8 +23,8 @@
         <if test="factDetermi != null and factDetermi != ''">fact_determi,</if>
         <if test="caseSketch != null and caseSketch != ''">case_sketch,</if>
         <if test="rulingFollows != null and rulingFollows != ''">ruling_follows,</if>
-        <if test="verifica_opinion != null and verifica_opinion != ''">verificaOpinion,</if>
-        <if test="check_opinion != null and check_opinion != ''">checkOpinion,</if>
+        <if test="verificaOpinion != null and verificaOpinion != ''">verifica_opinion,</if>
+        <if test="checkOpinion != null and checkOpinion != ''">check_opinion,</if>
         <if test="createBy != null  and createBy != ''">create_by,</if>
         create_time
         )values(

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -54,6 +54,12 @@
             <if test="caseNum != null and caseNum != ''">
                 AND c.case_num = #{caseNum}
             </if>
+            <if test="caseStatusList != null and caseStatusList.size() > 0">
+                and c.case_status in
+                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
+                    #{caseStatus}
+                </foreach>
+            </if>
         </where>
     </select>