Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -26,7 +26,16 @@ public class CaseApplication  extends BaseEntity {
     /** 仲裁方式 */
     private int arbitratMethod;
     /** 案件状态 */
-    private int caseStatus;
+    private Integer caseStatus;
+
+    public Integer getCaseStatus() {
+        return caseStatus;
+    }
+
+    public void setCaseStatus(Integer caseStatus) {
+        this.caseStatus = caseStatus;
+    }
+
     /** 开庭日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hearDate;
@@ -81,6 +90,16 @@ public class CaseApplication  extends BaseEntity {
     private int openCourtHear;
     /** 案件状态名称 */
     private String caseStatusName;
+    /** 是否同意审核 */
+    private Integer agreeOrNotCheck;
+
+    public Integer getAgreeOrNotCheck() {
+        return agreeOrNotCheck;
+    }
+
+    public void setAgreeOrNotCheck(Integer agreeOrNotCheck) {
+        this.agreeOrNotCheck = agreeOrNotCheck;
+    }
 
     public String getCaseStatusName() {
         return caseStatusName;
@@ -403,13 +422,7 @@ public class CaseApplication  extends BaseEntity {
         this.arbitratMethod = arbitratMethod;
     }
 
-    public int getCaseStatus() {
-        return caseStatus;
-    }
 
-    public void setCaseStatus(int caseStatus) {
-        this.caseStatus = caseStatus;
-    }
 
     public Date getHearDate() {
         return hearDate;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

@@ -31,4 +31,6 @@ public interface ICaseApplicationService {
     int pendTralSure(CaseApplication caseApplication);
 
     int verificationArbitrateRecord(CaseApplication caseApplication);
+
+    int checkArbitrateRecord(CaseApplication caseApplication);
 }

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

@@ -269,6 +269,24 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+    @Override
+    @Transactional
+    public int checkArbitrateRecord(CaseApplication caseApplication) {
+        int rows = 0;
+        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+        arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+        Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
+        if(agreeOrNotCheck.intValue()==1){//同意审核
+            caseApplication.setCaseStatus(CaseApplicationConstants.SIGN_ARBITRATION);
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }else if(agreeOrNotCheck.intValue()==2){//拒绝审核
+            caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }
+
+        return rows;
+    }
+
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {