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

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

@@ -1873,13 +1873,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
         // 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11）
         int rows = 0;
-        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
-        if(arbitrateRecord.getId()!=null){
-            arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
-        }else {
-            arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
-        }
-
         Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
         if (agreeOrNotCheck.intValue() == 1) {
             caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
@@ -1888,6 +1881,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             // 新增日志
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
         } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
+            ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+            if(arbitrateRecord.getId()!=null){
+                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+            }else {
+                arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
+            }
             caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
 
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);