From 913ca3547a117f3b0a591c59ca96207110b908ab Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Sun, 15 Oct 2023 18:38:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wisdomarbitrate/CaseApplicationMapper.xml | 69 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 2c77c8a..c26c59d 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -59,7 +59,72 @@
         c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName,c.register_date,c.filearbitra_url
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
-        LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
+        <where>
+            <if test="caseStatus != null">
+                AND c.case_status = #{caseStatus}
+            </if>
+            <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>
+        ) t <where>
+        <!--申请人-->
+        <if test="nameId != null and nameId != ''">
+            or ( t.application_organ_id = #{nameId}  AND t.identity_type=1 )
+        </if>
+        <!--被申请人-->
+        <if test="idCard != null and idCard != ''">
+            or (t.identity_num=#{idCard}  AND t.identity_type=2)
+        </if>
+        <!--仲裁员-->
+        <if test="userId != null and userId != ''">
+            or instr  (t.arbitrator_id,#{userId})>0
+        </if>
+        <!--法律顾问-->
+        <if test="deptIds != null and deptIds.size() > 0">
+            or t.name
+            in
+            <foreach item="item" collection="deptIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+    </where>
+        ) t1
+        <where>
+            <!--申请人-->
+            <if test="nameId != null and nameId != ''">
+                and ( t1.applicationOrganId = #{nameId}  AND t1.identity_type=1 )
+            </if>
+        </where>
+        order by t1.create_time desc,t1.case_num desc
+    </select>
+    <select id="selectAdminCaseApplicationList" 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 '待案件归档' when 17 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_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
+        from case_application c
+        LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
         <where>
             <if test="caseStatus != null">
                 AND c.case_status = #{caseStatus}
@@ -68,7 +133,7 @@
                 AND c.case_num = #{caseNum}
             </if>
             <if test="nameId != null and nameId != ''">
-                AND ca.NAME=#{nameId}  AND ca.identity_type=1 and ca.name=d.dept_id
+                AND ca.application_organ_id=#{nameId}  AND ca.identity_type=1
             </if>
             <if test="caseStatusList != null and caseStatusList.size() > 0">
                 and c.case_status in

From c91bbf834acfd0195fe3140f867cb996891df8d4 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Sun, 15 Oct 2023 18:50:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CaseApplicationServiceImpl.java       |  7 +++----
 .../mapper/wisdomarbitrate/CaseApplicationMapper.xml   | 10 +++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 7b899e4..4ea7d9a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.entity.*;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.EsignDemoException;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.WordUtil;
+import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
 
 
@@ -29,9 +29,6 @@ import com.ruoyi.common.exception.EsignDemoException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SmsUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.wisdomarbitrate.domain.*;
@@ -56,6 +53,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.common.utils.PageUtils.startPage;
 import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 
@@ -111,6 +109,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         SysUser sysUser = sysUserMapper.selectUserById(userId);
         caseApplication.setIdCard(sysUser.getIdCard());
         caseApplication.setUserId(String.valueOf(userId));
+        startPage();
         for (SysRole role : roles) {
             // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
             if(role.getRoleName().equals("超级管理员")
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index c26c59d..8adfda7 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -251,6 +251,9 @@
         </set>
         where id = #{id}
     </update>
+    <update id="updatePayType">
+        update case_application set pay_type=#{payType} where id = #{caseId}
+    </update>
 
     <delete id="deletecaseApplication" parameterType="CaseApplication">
         delete from case_application where id = #{id}
@@ -273,10 +276,10 @@
         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,d.dept_name as applicantName
+        c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
-        LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
+
         <where>
             <if test="id != null ">
                 AND c.id = #{id}
@@ -305,7 +308,8 @@
         p.payment_status ,
         CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
         ELSE '无支付状态'
-        END paymentStatusName
+        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 p.payment_status  = 1
             AND c.id = #{id}

From 26c90d4c32f4cf7024e50029dcfc55444c1202ee Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Sun, 15 Oct 2023 18:53:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 8adfda7..38d2b6a 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -122,7 +122,7 @@
         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_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
+        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
         <where>