From 34e9faafe2ece2ee421a2dc0108fb1ccbfb1398b Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Wed, 13 Dec 2023 10:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=B2=E8=A3=81=E5=91=98?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CaseApplicationServiceImpl.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 303b86f..a4162e2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -1656,8 +1656,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Transactional
     public AjaxResult checkArbitrateRecord(CaseApplication caseApplication) {
         int rows = 0;
-        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
-        arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+
         Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
         if (agreeOrNotCheck.intValue() == 1) {//同意审核
             try {
@@ -1845,6 +1844,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
+            ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+            arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+
             caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
             // 新增日志
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, "");
@@ -1865,13 +1867,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);
@@ -1879,6 +1874,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
+            ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+            arbitrateRecord.setCaseAppliId(caseApplication.getId());
+            if(arbitrateRecord.getId()!=null){
+                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+            }else {
+                arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
+            }
+
             caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
             // 新增日志
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, "");