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

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

@@ -49,7 +49,7 @@
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         select t1.* from(
         select DISTINCT(t.id),t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
-             t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims ,
+        t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims ,
         t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed ,t.claim_liquid_damag,t.fee_payable ,
         t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
         t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
@@ -101,7 +101,7 @@
             <!--仲裁员-->
             <if test="userId != null and userId != ''">
                 or ( t.identity_type=1 and
-                       t.case_status in (7,8,9,12,13,14)
+                t.case_status in (7,8,9,12,13,14)
                 and
                 instr (t.arbitrator_id,#{userId})>0)
             </if>
@@ -114,33 +114,34 @@
                 </foreach> )
             </if>
 
-                <!--申请人-->
-                <if test="nameId != null and nameId != ''">
-                    or ( t.application_organ_id = #{nameId} AND t.identity_type=1
-                    and t.case_status in (0,2))
+            <!--申请人-->
+            <if test="nameId != null and nameId != ''">
+                or ( t.application_organ_id = #{nameId} AND t.identity_type=1
+                and t.case_status in (0,2))
 
-                </if>
-        <!--部门长-->
+            </if>
+            <!--部门长-->
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
-            or (t.identity_type=1 and t.case_status in
-            <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">#{caseStatus}
-            </foreach>)
+                or (t.identity_type=1 and t.case_status in
+                <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">#{caseStatus}
+                </foreach>)
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                 (t.identity_type=1 and t.case_status =#{financeStatus})
+                or  (t.identity_type=1 and t.case_status =#{financeStatus})
+
 
             </if>
         </where>
         ) t1
-<!--        <where>-->
-<!--            &lt;!&ndash;申请人&ndash;&gt;-->
-<!--            <if test="nameId != null and nameId != ''">-->
-<!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
-<!--                    and t1.case_status in (0,2)-->
-<!--                )-->
-<!--            </if>-->
-<!--        </where>-->
+        <!--        <where>-->
+        <!--            &lt;!&ndash;申请人&ndash;&gt;-->
+        <!--            <if test="nameId != null and nameId != ''">-->
+        <!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
+        <!--                    and t1.case_status in (0,2)-->
+        <!--                )-->
+        <!--            </if>-->
+        <!--        </where>-->
         order by t1.create_time desc,t1.case_num desc
     </select>
     <select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
@@ -165,7 +166,7 @@
         from(
         select  DISTINCT(t.id),t.case_status,t.application_organ_id, t.arbitrator_id,t.identity_num , t.identity_type from(
         select c.id ,
-         c.case_status,ca.application_organ_id,
+        c.case_status,ca.application_organ_id,
         c.arbitrator_id,ca.identity_num , ca.identity_type
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
@@ -220,19 +221,19 @@
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                ( t.identity_type=1 and t.case_status =#{financeStatus})
+             or   ( t.identity_type=1 and t.case_status =#{financeStatus})
 
             </if>
         </where>
         ) t1
         <!--      <where>
                    &lt;!&ndash;申请人&ndash;&gt;-->
-<!--            <if test="nameId != null and nameId != ''">-->
-<!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
-<!--                and t1.case_status in (0,2)-->
-<!--                )-->
-<!--            </if>
-        </where> -->
+        <!--            <if test="nameId != null and nameId != ''">-->
+        <!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
+        <!--                and t1.case_status in (0,2)-->
+        <!--                )-->
+        <!--            </if>
+                </where> -->
     </select>
 
     <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
@@ -296,7 +297,7 @@
             sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived
         FROM
             case_application c
-                 JOIN case_affiliate ca ON ca.case_appli_id = c.id
+                JOIN case_affiliate ca ON ca.case_appli_id = c.id
                 AND ca.identity_type = 1
         WHERE
                 c.case_status IN (
@@ -388,10 +389,10 @@
         <where>
             <!--部门长-->
             <if test="statusList != null and statusList.size() > 0">
-            or c.case_status in
-            <foreach item="caseStatus" collection="statusList" open="(" separator="," close=")">
-                #{caseStatus}
-            </foreach>
+                or c.case_status in
+                <foreach item="caseStatus" collection="statusList" open="(" separator="," close=")">
+                    #{caseStatus}
+                </foreach>
                 <!--被申请人-->
                 <if test="idCard != null and idCard != ''">
                     or (t.identity_num=#{idCard} AND t.identity_type=2 and t.case_status=4)
@@ -463,7 +464,7 @@
         )values(
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
-       sysdate(),
+        sysdate(),
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
         <if test="caseStatus != null ">#{caseStatus},</if>
         <if test="hearDate != null ">#{hearDate},</if>
@@ -559,8 +560,8 @@
     <select id="selectCaseApplication" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
-            ELSE '无审理方式'
-            END arbitratMethodName,
+        ELSE '无审理方式'
+        END arbitratMethodName,
         c.case_status ,
         CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
         when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
@@ -587,30 +588,30 @@
 
     <select id="selectCaseApplicationConfirm" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
-        CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
-        ELSE '无审理方式'
-        END arbitratMethodName,
-        c.case_status ,
-        CASE c.case_status 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 caseStatusName,
-        c.hear_date ,c.arbitrat_claims ,
-        c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
-        c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,
-        p.payment_status ,
-        CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
-        ELSE '无支付状态'
-        END paymentStatusName,c.pay_type,
-        CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
+               CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
+                                      ELSE '无审理方式'
+                   END arbitratMethodName,
+               c.case_status ,
+               CASE c.case_status 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 caseStatusName,
+               c.hear_date ,c.arbitrat_claims ,
+               c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
+               c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
+               c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,
+               p.payment_status ,
+               CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
+                                     ELSE '无支付状态'
+                   END paymentStatusName,c.pay_type,
+               CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
         from case_application c left join case_payment_record p on c.id  = p.case_id
         where c.case_status  = 3
-            AND c.id = #{id}
+          AND c.id = #{id}
 
     </select>
     <select id="selectCaseNumLike" resultType="java.lang.Integer">
@@ -622,4 +623,4 @@
     </select>
 
 
-</mapper>
+</mapper>