diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index bb6f40b..5f83a76 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -58,7 +58,7 @@
t1.filearbitra_url,t1.lock_status,t1.version,t1.updateSubmitStatus
from(
-
+
select t.id,t.caseLogId,t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
@@ -117,7 +117,7 @@
) t
-
+
or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
@@ -130,12 +130,12 @@
instr (t.arbitrator_id,#{userId})>0)
-
-
-
-
+
+
+
+
-
+
or (t.identity_type=1 and t.case_status in
@@ -334,20 +334,21 @@
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
) tt
-
-
- and tt.case_status in
-
- #{caseStatus}
-
-
-
- AND tt.case_status = #{caseStatus}
-
+
+
+ and tt.case_status in
+
+ #{caseStatus}
+
+
+
+ AND tt.case_status = #{caseStatus}
+
-
+
union
+ select tt2.* from(
SELECT
l.case_appli_id id,
l.id AS caseLogId,
@@ -420,33 +421,33 @@
c.update_by,
c.update_time,
c.arbitrator_name,
- ca.name,
+ ca.name,
ca.application_organ_id ,
ca.application_organ_name AS applicantName,
c.arbitrator_id,ca.identity_num ,ca.identity_type,
- c.filearbitra_url,c.lock_status,l.version,l.update_submit_status as updateSubmitStatus
+ c.filearbitra_url,c.lock_status,l.version,l.update_submit_status as updateSubmitStatus
FROM
case_application c
JOIN case_application_log l ON c.id = l.case_appli_id
JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
AND ca.identity_type = 1
WHERE
- l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1 and c.case_status >10
-
- and c.case_status in
-
- #{caseStatus}
-
-
+ l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
+
+
+
+
+
+
and ca.application_organ_id in
#{item}
-
- AND c.case_status = #{caseStatus}
-
+
+
+
AND c.lock_status = #{lockStatus}
@@ -467,6 +468,21 @@
case_application_log
WHERE
c.id = case_appli_id)
+ ) tt2
+
+
+
+ and tt.case_status in
+
+ #{caseStatus}
+
+
+
+ AND tt.case_status = #{caseStatus}
+
+
+
+
) t1
@@ -496,9 +512,9 @@
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
from case_log_record r
join case_application c on r.case_appli_id=c.id
- 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
-
+
AND c.lock_status = #{lockStatus}
@@ -553,7 +569,7 @@
applicantName,
c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,c.version
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 c.case_status = #{caseStatus}
@@ -589,13 +605,13 @@
instr (t.arbitrator_id,#{userId})>0)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -622,7 +638,7 @@
t.application_organ_id in
#{deptId}
- AND t.identity_type=1
+ AND t.identity_type=1
and t.case_status in (0,9))
@@ -653,112 +669,110 @@
sum( case when t1.case_status=31 then 1 else 0 end) updateOnlineHearDate
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.arbitrator_id,ca.identity_num , ca.identity_type
- from case_application c
- JOIN case_affiliate ca ON ca.case_appli_id = c.id
-
-
- AND c.case_status = #{caseStatus}
-
-
- AND c.case_num = #{caseNum}
-
-
- and c.case_status in
-
- #{caseStatus}
-
-
-
- ) t
-
+
+
+ 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.arbitrator_id,ca.identity_num , ca.identity_type
+ from case_application c
+ JOIN case_affiliate ca ON ca.case_appli_id = c.id
+
+
+ AND c.case_status = #{caseStatus}
+
-
-
- or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
+
+ and c.case_status in
+
+ #{caseStatus}
+
+
+
+ ) t
+
+
+
+
+ or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
+
+
+
+ or ( t.identity_type=1 and
+ t.case_status in (7,8,9,11,13,17)
+ and
+ instr (t.arbitrator_id,#{userId})>0)
+
+
+
+
+
+
+
+
+
+
+
+ or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
+ and t.case_status in (0,2,17))
+
+
+
+
+ or (t.identity_type=1 and t.case_status in
+
+ #{caseStatus}
+ )
+
+
+
+ or ( t.identity_type=1 and t.case_status =#{financeStatus})
+
+
+
+
+ or (
+ t.application_organ_id in
+ #{deptId}
+
+ AND t.identity_type=1
+ and t.case_status in (0,9))
+
+
+
+ union
-
-
- or ( t.identity_type=1 and
- t.case_status in (7,8,9,11,13,17)
- and
- instr (t.arbitrator_id,#{userId})>0)
-
-
-
-
-
-
-
-
-
-
-
- or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
- and t.case_status in (0,2,17))
+
+
-
-
-
- or (t.identity_type=1 and t.case_status in
-
- #{caseStatus}
- )
-
-
-
- or ( t.identity_type=1 and t.case_status =#{financeStatus})
+
+
+
+
+
+
+
+
-
-
-
- or (
- t.application_organ_id in
- #{deptId}
-
- AND t.identity_type=1
- and t.case_status in (0,9))
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- union
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -775,7 +789,7 @@
FROM
case_application_log
WHERE case_appli_id = c.id
- )
+ )
WHERE
ca.identity_type=1 and c.case_status in (1,5,14,15,16,17,31)
@@ -787,12 +801,7 @@
AND c.case_status = #{caseStatus}
-
- AND c.lock_status = #{lockStatus}
-
-
- AND c.case_num = #{caseNum}
-
+
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
@@ -822,9 +831,14 @@
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.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
- 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
+
AND c.case_status = #{caseStatus}
@@ -990,15 +1004,15 @@
JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
AND ca.identity_type = 1
WHERE
- ca.identity_type=1
+ ca.identity_type=1
-
+
or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
-
+
and (t.case_status <= 10 or t.case_status=31))
-
+
-
+
AND c.case_status = #{caseStatus}
@@ -1026,126 +1040,126 @@
@@ -1454,7 +1468,7 @@
update case_application set room_id=#{roomId} where id = #{caseId}
-
+
update case_application set version = #{version} where id = #{id}
@@ -1476,7 +1490,7 @@
CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
ELSE '无审理方式'
END arbitratMethodName,
- c.case_name,
+ c.case_name,
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 '待组庭审核'
@@ -1499,7 +1513,7 @@
AND c.id = #{id}
-order by c.create_time desc limit 1
+ order by c.create_time desc limit 1