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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

Browse Source
This commit is contained in:
qitz
2023-11-06 15:08:36 +08:00
parent 8ca9b43b3b 8ebf8ab2ea
commit 9402f26857
7 changed files with 73 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
+4 -1
View File
@@ -126,6 +126,9 @@
<if test="caseNum != null and caseNum != ''">
AND c.case_num = #{caseNum}
</if>
<if test="nameId != null and nameId != ''">
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if>
<if test="caseStatusList != null and caseStatusList.size() > 0">
and c.case_status in
<foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
@@ -161,7 +164,7 @@
<!--申请人-->
<if test="nameId != null and nameId != ''">
or ( t.application_organ_id = #{nameId} AND t.identity_type=1
or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
and t.case_status in (0,2,17))
</if>
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml
+4 -1
View File
@@ -12,12 +12,13 @@
<result property="sendTime" column="send_time" />
<result property="caseId" column="case_id" />
<result property="caseNum" column="case_num" />
<result property="sendStatus" column="send_status" />
</resultMap>
<select id="selectSendMailRecord" parameterType="SendMailRecord" resultMap="SendMailRecordResult">
SELECT s.id ,s.mail_name ,s.mail_content ,s.mail_address ,s.send_time ,s.case_id ,s.create_time ,s.create_by ,
s.update_by ,s.update_time ,c.case_num
s.update_by ,s.update_time , s.send_status ,c.case_num
from send_mail_record s left join case_application c
on s.case_id = c.id
<where>
@@ -35,6 +36,7 @@
<if test="mailAddress != null and mailAddress != ''">mail_address,</if>
<if test="sendTime != null ">send_time,</if>
<if test="caseId != null ">case_id,</if>
<if test="sendStatus != null ">send_status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
@@ -43,6 +45,7 @@
<if test="mailAddress != null and mailAddress != ''">#{mailAddress},</if>
<if test="sendTime != null ">#{sendTime},</if>
<if test="caseId != null ">#{caseId},</if>
<if test="sendStatus != null ">#{sendStatus},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)