SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
hejinbo
2023-11-29 16:04:19 +08:00
parent cbc1a23715 8a48dbbab0
commit 7bcb28cdac
1 changed files with 434 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+34 -20
View File
@@ -348,6 +348,7 @@
</where> </where>
union union
<!--秘书审核案件--> <!--秘书审核案件-->
select tt2.* from(
SELECT SELECT
l.case_appli_id id, l.case_appli_id id,
l.id AS caseLogId, l.id AS caseLogId,
@@ -431,22 +432,22 @@
JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
AND ca.identity_type = 1 AND ca.identity_type = 1
WHERE WHERE
l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1 and c.case_status >10 l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
<if test="caseStatusList != null and caseStatusList.size() > 0"> <!-- <if test="caseStatusList != null and caseStatusList.size() > 0">-->
and c.case_status in <!-- and c.case_status in-->
<foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")"> <!-- <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">-->
#{caseStatus} <!-- #{caseStatus}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="deptIds != null and deptIds.size() > 0"> <if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")"> <foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="caseStatus != null"> <!-- <if test="caseStatus != null">-->
AND c.case_status = #{caseStatus} <!-- AND c.case_status = #{caseStatus}-->
</if> <!-- </if>-->
<if test="lockStatus != null"> <if test="lockStatus != null">
AND c.lock_status = #{lockStatus} AND c.lock_status = #{lockStatus}
</if> </if>
@@ -467,6 +468,21 @@
case_application_log case_application_log
WHERE WHERE
c.id = case_appli_id) c.id = case_appli_id)
) tt2
<where>
<if test="caseStatusList != null and caseStatusList.size() > 0">
and tt2.case_status in
<foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
#{caseStatus}
</foreach>
</if>
<if test="caseStatus != null">
AND tt2.case_status = #{caseStatus}
</if>
</where>
</if> </if>
</trim> </trim>
) t1 ) t1
@@ -665,9 +681,7 @@
<if test="caseStatus != null"> <if test="caseStatus != null">
AND c.case_status = #{caseStatus} AND c.case_status = #{caseStatus}
</if> </if>
<if test="caseNum != null and caseNum != ''">
AND c.case_num = #{caseNum}
</if>
<if test="caseStatusList != null and caseStatusList.size() > 0"> <if test="caseStatusList != null and caseStatusList.size() > 0">
and c.case_status in and c.case_status in
<foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")"> <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
@@ -787,12 +801,7 @@
<if test="caseStatus != null"> <if test="caseStatus != null">
AND c.case_status = #{caseStatus} AND c.case_status = #{caseStatus}
</if> </if>
<if test="lockStatus != null">
AND c.lock_status = #{lockStatus}
</if>
<if test="caseNum != null and caseNum != ''">
AND c.case_num = #{caseNum}
</if>
<if test="nameId != null and nameId != ''"> <if test="nameId != null and nameId != ''">
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if> </if>
@@ -822,9 +831,14 @@
c.hear_date ,c.arbitrat_claims , 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.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.lock_status, c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,c.version c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,(select version from
case_application_log where case_appli_id=c.id order by version desc limit 1) as version,(select
update_submit_status from case_application_log where case_appli_id=c.id order by version desc limit 1)
as updateSubmitStatus
from case_application c from case_application c
JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
JOIN case_application_log l ON c.id = l.case_appli_id and c.version=l.version
<where> <where>
<if test="caseStatus != null"> <if test="caseStatus != null">
AND c.case_status = #{caseStatus} AND c.case_status = #{caseStatus}