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 #56.
This commit is contained in:
wangqiong123
2023-10-11 12:02:47 +08:00
committed by Gitea
parent aa2e6af52c 4c93945eaf
commit f745fdd0aa
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+3
View File
@@ -489,6 +489,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
rows = caseApplicationMapper.submitCaseApplication(caseApplication); rows = caseApplicationMapper.submitCaseApplication(caseApplication);
} }
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_PAYMENT,"");
return rows; return rows;
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class CaseLogRecordServiceImpl implements ICaseLogRecordService {
contentBuilder.append("提交立案申请"); contentBuilder.append("提交立案申请");
break; break;
case 2: case 2:
contentBuilder.append("提交立案审查"); contentBuilder.append("立案审查");
break; break;
case 3: case 3:
contentBuilder.append("支付成功"); contentBuilder.append("支付成功");
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1 -1
View File
@@ -66,7 +66,7 @@
<if test="caseNum != null and caseNum != ''"> <if test="caseNum != null and caseNum != ''">
AND c.case_num = #{caseNum} AND c.case_num = #{caseNum}
</if> </if>
<if test="name != null and name != ''"> <if test="nameId != null and nameId != ''">
AND ca.NAME=#{nameId} AND ca.identity_type=1 and ca.name=d.dept_id AND ca.NAME=#{nameId} AND ca.identity_type=1 and ca.name=d.dept_id
</if> </if>
<if test="caseStatusList != null and caseStatusList.size() > 0"> <if test="caseStatusList != null and caseStatusList.size() > 0">
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml
+2 -2
View File
@@ -22,7 +22,7 @@
</insert> </insert>
<select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord"> <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes ,cl.id ,cl.case_appli_id caseAppliId, select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes ,cl.id ,cl.case_appli_id caseAppliId,
cl.create_by createBy,cl.create_nick_name createNickName cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime
from case_log_record cl from case_log_record cl
<where> <where>
@@ -31,7 +31,7 @@
AND cl.case_appli_id = #{caseAppliId} AND cl.case_appli_id = #{caseAppliId}
</if> </if>
</where> </where>
order by create_time desc order by create_time asc
</select> </select>