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

联调修改

Browse Source
This commit is contained in:
18792927508
2023-11-23 09:02:20 +08:00
parent d6bb72d5eb
commit 213e27e4e7
11 changed files with 303 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+11 -5
View File
@@ -300,9 +300,15 @@
FROM
case_application_log
WHERE case_appli_id = c.id
and update_submit_status not IN ( 1, 2 ))
)
WHERE
ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31)
<if test="caseStatusList != null and caseStatusList.size() > 0">
and c.case_status in
<foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
#{caseStatus}
</foreach>
</if>
<if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")">
@@ -435,7 +441,7 @@
FROM
case_application_log
WHERE
update_submit_status IN ( 1, 2 ) and c.id = l.case_appli_id)
update_submit_status IN ( 1, 2 ) and c.id = case_appli_id)
</if>
</trim>
) t1
@@ -742,14 +748,14 @@
FROM
case_application c
JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1,4) and l.version
JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1,2) and l.version
= (
SELECT
max( version ) version
FROM
case_application_log
WHERE case_appli_id = c.id
and update_submit_status not IN ( 1, 4 ))
)
WHERE
ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31)
<if test="deptIds != null and deptIds.size() > 0">
@@ -807,7 +813,7 @@
FROM
case_application_log
WHERE
update_submit_status IN ( 1, 4 ) and c.id = l.case_appli_id)
update_submit_status IN ( 1, 4 ) and c.id = case_appli_id)
</if>
</trim>