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

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

Browse Source
This commit was merged in pull request #304.
This commit is contained in:
qtz
2023-12-12 18:26:54 +08:00
committed by Gitea
parent 02386824af 7ace643452
commit d4db9785b3
2 changed files with 8 additions and 1 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
+6 -1
View File
@@ -1866,7 +1866,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11）
int rows = 0;
ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
if(arbitrateRecord.getId()!=null){
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
}else {
arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
}
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
if (agreeOrNotCheck.intValue() == 1) {
caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml
+2
View File
@@ -33,6 +33,7 @@
<if test="checkOpinion != null and checkOpinion != ''">check_opinion,</if>
<if test="caseCheckReject != null and caseCheckReject != ''">case_check_reject,</if>
<if test="arbitrateReject != null and arbitrateReject != ''">arbitrate_reject,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
case_focus,
case_facts,
@@ -49,6 +50,7 @@
<if test="arbitrateThink != null and arbitrateThink != ''">#{arbitrateThink},</if>
<if test="checkOpinion != null and checkOpinion != ''">#{checkOpinion},</if>
<if test="caseCheckReject != null and caseCheckReject != ''">#{caseCheckReject},</if>
<if test="arbitrateReject != null and arbitrateReject != ''">#{arbitrateReject},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
#{caseFocus},
#{caseFacts},