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

2023-09-22 15:10:22 +08:00
parent 76847fafb1 12a40e76d9
commit 5a0d1dbe0b
3 changed files with 80 additions and 36 deletions
@@ -24,7 +24,26 @@ public class CaseApplication  extends BaseEntity {
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date registerDate;
    /** 仲裁方式 */
-    private int arbitratMethod;
+    private Integer arbitratMethod;
+
+    public Integer getArbitratMethod() {
+        return arbitratMethod;
+    }
+
+    public void setArbitratMethod(Integer arbitratMethod) {
+        this.arbitratMethod = arbitratMethod;
+    }
+    /** 仲裁方式名称 */
+    private String arbitratMethodName;
+
+    public String getArbitratMethodName() {
+        return arbitratMethodName;
+    }
+
+    public void setArbitratMethodName(String arbitratMethodName) {
+        this.arbitratMethodName = arbitratMethodName;
+    }
+
    /** 案件状态 */
    private Integer caseStatus;

@@ -82,12 +101,37 @@ public class CaseApplication  extends BaseEntity {
    private String caseDescribe;

    /** 是否同意组庭 */
-    private int isAgreePendTral;
+    private Integer isAgreePendTral;

    /** 是否有异议需要举证 */
-    private int objectionAddEviden;
+    private Integer objectionAddEviden;
    /** 是否需要开庭审理 */
-    private int openCourtHear;
+    private Integer openCourtHear;
+
+    public Integer getIsAgreePendTral() {
+        return isAgreePendTral;
+    }
+
+    public void setIsAgreePendTral(Integer isAgreePendTral) {
+        this.isAgreePendTral = isAgreePendTral;
+    }
+
+    public Integer getObjectionAddEviden() {
+        return objectionAddEviden;
+    }
+
+    public void setObjectionAddEviden(Integer objectionAddEviden) {
+        this.objectionAddEviden = objectionAddEviden;
+    }
+
+    public Integer getOpenCourtHear() {
+        return openCourtHear;
+    }
+
+    public void setOpenCourtHear(Integer openCourtHear) {
+        this.openCourtHear = openCourtHear;
+    }
+
    /** 案件状态名称 */
    private String caseStatusName;
    /** 是否同意审核 */
@@ -130,29 +174,7 @@ public class CaseApplication  extends BaseEntity {
        this.respondentName = respondentName;
    }

-    public int getObjectionAddEviden() {
-        return objectionAddEviden;
-    }

-    public void setObjectionAddEviden(int objectionAddEviden) {
-        this.objectionAddEviden = objectionAddEviden;
-    }
-
-    public int getOpenCourtHear() {
-        return openCourtHear;
-    }
-
-    public void setOpenCourtHear(int openCourtHear) {
-        this.openCourtHear = openCourtHear;
-    }
-
-    public int getIsAgreePendTral() {
-        return isAgreePendTral;
-    }
-
-    public void setIsAgreePendTral(int isAgreePendTral) {
-        this.isAgreePendTral = isAgreePendTral;
-    }

    public String getCaseName() {
        return caseName;
@@ -414,13 +436,6 @@ public class CaseApplication  extends BaseEntity {
        this.registerDate = registerDate;
    }

-    public int getArbitratMethod() {
-        return arbitratMethod;
-    }
-
-    public void setArbitratMethod(int arbitratMethod) {
-        this.arbitratMethod = arbitratMethod;
-    }



@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -53,6 +54,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
    public int insertcaseApplication(CaseApplication caseApplication) {
        // 新增立案信息
        caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
+        //根据仲裁费用计费规则计算应缴费用
+        //暂时设置计费比率为0.01
+        BigDecimal feeRate = new BigDecimal(0.01);
+        BigDecimal feePayable  = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
+        caseApplication.setFeePayable(feePayable);
+
        int rows = caseApplicationMapper.insertCaseApplication(caseApplication);
        List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
        if(caseAffiliates!=null&&caseAffiliates.size()>0){