发版合并 #363

Merged
wangqiong123 merged 129 commits from dev into pro 2024-06-03 02:26:01 +00:00
Showing only changes of commit eeb6757ec8 - Show all commits
@@ -856,7 +856,8 @@
<select id="selectAdminCaseApplicationListBatch" parameterType="CaseApplication" resultMap="CaseApplicationResult">
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 '书面审理'
ELSE '无审理方式'
END arbitratMethodName
@@ -866,6 +867,9 @@
<if test="batchNumber != null and batchNumber != ''">
AND c.batch_number = #{batchNumber}
</if>
<if test="nameId != null and nameId != ''">
AND a.application_organ_id=#{nameId}
</if>
order by c.batch_number desc
</select>