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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -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

@@ -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},