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

This commit was merged in pull request #330.
This commit is contained in:
qtz
2024-01-05 17:55:55 +08:00
committed by Gitea
@@ -856,7 +856,8 @@
<select id="selectAdminCaseApplicationListBatch" parameterType="CaseApplication" resultMap="CaseApplicationResult"> <select id="selectAdminCaseApplicationListBatch" parameterType="CaseApplication" resultMap="CaseApplicationResult">
SELECT DISTINCT c.batch_number ,c.arbitrat_method ,c.arbitrator_name , SELECT DISTINCT c.batch_number ,c.arbitrat_method ,c.arbitrator_name ,
c.arbitrator_id ,a.identity_type ,a.name , c.arbitrator_id ,a.identity_type ,a.name ,a.application_organ_id as applicationOrganId,
a.application_organ_name as applicantName,
CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理' CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
ELSE '无审理方式' ELSE '无审理方式'
END arbitratMethodName END arbitratMethodName
@@ -866,6 +867,9 @@
<if test="batchNumber != null and batchNumber != ''"> <if test="batchNumber != null and batchNumber != ''">
AND c.batch_number = #{batchNumber} AND c.batch_number = #{batchNumber}
</if> </if>
<if test="nameId != null and nameId != ''">
AND a.application_organ_id=#{nameId}
</if>
order by c.batch_number desc order by c.batch_number desc
</select> </select>