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

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

@@ -2,7 +2,6 @@ package com.ruoyi.wisdomarbitrate.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -25,7 +24,7 @@ public class CaseApplication  extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date registerDate;
     /** 仲裁方式 */
-    private String arbitratMethod;
+    private int arbitratMethod;
     /** 案件状态 */
     private int caseStatus;
     /** 开庭日期 */
@@ -324,11 +323,11 @@ public class CaseApplication  extends BaseEntity {
         this.registerDate = registerDate;
     }
 
-    public String getArbitratMethod() {
+    public int getArbitratMethod() {
         return arbitratMethod;
     }
 
-    public void setArbitratMethod(String arbitratMethod) {
+    public void setArbitratMethod(int arbitratMethod) {
         this.arbitratMethod = arbitratMethod;
     }
 

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

@@ -0,0 +1,46 @@
+package com.ruoyi.wisdomarbitrate.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CaseAttach {
+    /**
+     *  附件id
+     */
+    private Integer annexId;
+    /**
+     * 案件申请id
+     */
+    private Long caseAppliId;
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件路径
+     */
+    private String annexPath;
+    /**
+     * 附件类型,立案申请书(1)、证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)
+     */
+    private Integer annexType;
+    /**
+     * 备注
+     */
+    private String note;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户账户
+     */
+    private String userName;
+
+}

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

@@ -14,7 +14,7 @@ public class CaseLogRecord     extends BaseEntity {
     /** 案件申请id */
     private Long caseAppliId;
     /** 案件节点 */
-    private String caseNode;
+    private Integer caseNode;
 
     /** 案件节点时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -50,11 +50,11 @@ public class CaseLogRecord     extends BaseEntity {
         this.caseAppliId = caseAppliId;
     }
 
-    public String getCaseNode() {
+    public int getCaseNode() {
         return caseNode;
     }
 
-    public void setCaseNode(String caseNode) {
+    public void setCaseNode(int caseNode) {
         this.caseNode = caseNode;
     }
 

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

@@ -0,0 +1,41 @@
+package com.ruoyi.wisdomarbitrate.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CasePaymentRecord {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 案件id
+     */
+    private Long caseId;
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+    /**
+     * 支付状态(0未支付,1已支付)
+     */
+    private Integer paymentStatus;
+    /**
+     * 支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date paymentTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java

@@ -0,0 +1,26 @@
+package com.ruoyi.wisdomarbitrate.domain.dto;
+
+import lombok.Data;
+/**
+ * 案件缴费传入参数
+ */
+@Data
+public class CasePayDTO {
+    /**
+     * 案件id
+     */
+    private Long caseId;
+
+    /**
+     * 订单金额 单位:分
+     */
+    private int totalFee;
+    /**
+     * 交易类型 native（扫码） / jsapi(小程序) / app / h5
+     */
+    private String tradeType;
+    /**
+     * 支付方式 wxpay(微信)  alipay(支付宝)
+     */
+    private String platform;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java

@@ -0,0 +1,67 @@
+package com.ruoyi.wisdomarbitrate.domain.vo;
+
+import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CaseDetailVO {
+    /**
+     * ID
+     */
+    private Long id;
+    /**
+     * 案件编号
+     */
+    private String caseNum;
+    /**
+     * 申请人姓名
+     */
+    private String applicantName;
+    /**
+     * 被申请人姓名
+     */
+    private String respondentName;
+    /**
+     * 借款开始日期
+     */
+    private Date loanStartDate;
+    /**
+     * 借款结束日期
+     */
+    private Date loanEndDate;
+    /**
+     * 案件标的
+     */
+    private BigDecimal caseSubjectAmount;
+    /**
+     * 申请人主张欠本金
+     */
+    private BigDecimal claimPrinciOwed;
+    /**
+     * 申请人主张欠利息
+     */
+    private BigDecimal claimInterestOwed;
+    /**
+     * 申请人主张违约金
+     */
+    private BigDecimal claimLiquidDamag;
+
+    /**
+     * 证据材料
+     */
+    private List<CaseAttach> evidenceMaterialList;
+    /**
+     * 当前登录人身份类型
+     */
+    private Integer identityType;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java

@@ -0,0 +1,28 @@
+package com.ruoyi.wisdomarbitrate.domain.vo;
+
+
+import lombok.Data;
+
+@Data
+public class CaseEvidenceVO {
+    /**
+     * 案件id
+     */
+    private Long id;
+    /**
+     * 案件编号
+     */
+    private String caseNum;
+    /**
+     * 申请人姓名
+     */
+    private String applicantName;
+    /**
+     * 被申请人姓名
+     */
+    private String respondentName;
+    /**
+     * 案件状态
+     */
+    private Integer caseStatus;
+}