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

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

Browse Source
This commit was merged in pull request #121.
This commit is contained in:
wangqiong123
2023-10-18 18:14:27 +08:00
committed by Gitea
parent 23e29a282e 1c6544fea7
commit 0e8580143b
1 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+16 -15
View File
@@ -128,19 +128,20 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <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> </if>
</where> </where>
) t1 ) t1
<!-- <where>--> <!-- <where>-->
<!-- &lt;!&ndash;申请人&ndash;&gt;--> <!-- &lt;!&ndash;申请人&ndash;&gt;-->
<!-- <if test="nameId != null and nameId != ''">--> <!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1--> <!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)--> <!-- and t1.case_status in (0,2)-->
<!-- )--> <!-- )-->
<!-- </if>--> <!-- </if>-->
<!-- </where>--> <!-- </where>-->
order by t1.create_time desc,t1.case_num desc order by t1.create_time desc,t1.case_num desc
</select> </select>
<select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount"> <select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
@@ -220,18 +221,18 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <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> </if>
</where> </where>
) t1 ) t1
<!-- <where> <!-- <where>
&lt;!&ndash;申请人&ndash;&gt;--> &lt;!&ndash;申请人&ndash;&gt;-->
<!-- <if test="nameId != null and nameId != ''">--> <!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1--> <!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)--> <!-- and t1.case_status in (0,2)-->
<!-- )--> <!-- )-->
<!-- </if> <!-- </if>
</where> --> </where> -->
</select> </select>