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-12-08 18:03:04 +08:00
parent 3eeb1a0882 4bc2940f9e
commit 0755325701
6 changed files with 249 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1 -1
View File
@@ -1432,7 +1432,7 @@
c.disputes,
c.loan_type,
c.loan_term,
c.mediation_agreement
c.mediation_agreement,c.template_id templateId
from case_application c
LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/FatchRuleMapper.xml
+3 -3
View File
@@ -19,7 +19,7 @@
<select id="selectFatchRuleList" parameterType="FatchRule" resultMap="BaseResultMap">
SELECT f.id ,f.file_name ,f.start_content ,f.end_content ,
f.`column` ,f.is_default ,f.columnName
f.`column` ,f.is_default ,f.`column_name`
FROM template_fatch_rule tf
left join template_manage t on tf.template_id = t.id
LEFT JOIN fatch_rule f on tf.fatch_rule_id = f.id
@@ -65,7 +65,7 @@
<select id="selectFatchRuleListIsDefault" parameterType="FatchRule" resultMap="BaseResultMap">
SELECT f.id ,f.file_name ,f.start_content ,f.end_content ,
f.`column` ,f.is_default ,f.columnName
f.`column` ,f.is_default ,f.`column_name`
FROM fatch_rule f
<where>
<if test="isDefault != null">
@@ -87,7 +87,7 @@
<if test="startContent != null and startContent != ''">start_content,</if>
<if test="endContent != null and endContent != ''">end_content,</if>
<if test="column != null and column != ''">`column`,</if>
<if test="columnName != null and columnName != ''">columnName,</if>
<if test="columnName != null and columnName != ''">`column_name`,</if>
<if test="isDefault != null">is_default</if>
)values(
<if test="fileName != null and fileName != ''">#{fileName},</if>