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

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

@@ -0,0 +1,32 @@
+package com.ruoyi.wisdomarbitrate.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class ArbitrateRecord     extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+    /** 案件申请id */
+    private Long caseAppliId;
+    /** 证据认定 */
+    private String evidenDetermi;
+    /** 认定事实 */
+    private String factDetermi;
+    /** 综上所述 */
+    private String caseSketch;
+    /** 本庭认为 */
+    private String arbitrateThink;
+    /** 裁决如下 */
+    private String rulingFollows;
+    /** 核验裁决书意见 */
+    private String verificaOpinion;
+    /** 审核裁决书意见 */
+    private String checkOpinion;
+
+
+
+
+}

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

@@ -2,6 +2,8 @@ package com.ruoyi.wisdomarbitrate.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 public class Arbitrator    extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -22,6 +24,16 @@ public class Arbitrator    extends BaseEntity {
     /** 联系电话 */
     private String telephone;
 
+    List<Long> idList;
+
+    public List<Long> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
     public String getArbitratorName() {
         return arbitratorName;
     }

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

@@ -54,8 +54,7 @@ public class CaseApplication  extends BaseEntity {
     private BigDecimal claimLiquidDamag;
     /** 仲裁应缴费用 */
     private BigDecimal feePayable;
-    /** 仲裁实缴费用 */
-    private BigDecimal paidExpenses;
+
     /** 开始在线视频时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginVideoDate;
@@ -80,6 +79,37 @@ public class CaseApplication  extends BaseEntity {
     private int objectionAddEviden;
     /** 是否需要开庭审理 */
     private int openCourtHear;
+    /** 案件状态名称 */
+    private String caseStatusName;
+
+    public String getCaseStatusName() {
+        return caseStatusName;
+    }
+
+    public void setCaseStatusName(String caseStatusName) {
+        this.caseStatusName = caseStatusName;
+    }
+
+    /** 申请人名称 */
+    private String applicantName;
+    /** 被申请人名称 */
+    private String respondentName;
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public String getRespondentName() {
+        return respondentName;
+    }
+
+    public void setRespondentName(String respondentName) {
+        this.respondentName = respondentName;
+    }
 
     public int getObjectionAddEviden() {
         return objectionAddEviden;
@@ -169,6 +199,17 @@ public class CaseApplication  extends BaseEntity {
     /** 案件仲裁员 */
     private List<Arbitrator> arbitrators;
 
+    /** 仲裁记录 */
+    private ArbitrateRecord arbitrateRecord;
+
+    public ArbitrateRecord getArbitrateRecord() {
+        return arbitrateRecord;
+    }
+
+    public void setArbitrateRecord(ArbitrateRecord arbitrateRecord) {
+        this.arbitrateRecord = arbitrateRecord;
+    }
+
     public List<Arbitrator> getArbitrators() {
         return arbitrators;
     }
@@ -424,13 +465,7 @@ public class CaseApplication  extends BaseEntity {
         this.feePayable = feePayable;
     }
 
-    public BigDecimal getPaidExpenses() {
-        return paidExpenses;
-    }
 
-    public void setPaidExpenses(BigDecimal paidExpenses) {
-        this.paidExpenses = paidExpenses;
-    }
 
     public Date getBeginVideoDate() {
         return beginVideoDate;