diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 01ad79a..cd65ab5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -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; - } 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 973cf69..81e7b5d 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 @@ -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 caseAffiliates = caseApplication.getCaseAffiliates(); if(caseAffiliates!=null&&caseAffiliates.size()>0){ diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 8f09ff5..2c795cf 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -28,12 +28,20 @@ + + + + - select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,c.case_status ,c.hear_date ,c.arbitrat_claims , + select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method , + CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理' + ELSE '无审理方式' + END arbitratMethodName, + c.case_status , + CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' + when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' + when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' + when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' + when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印' + when 15 then '待仲裁文书送达' when 16 then '待案件归档' + ELSE '无案件状态' + END caseStatusName, + c.hear_date ,c.arbitrat_claims , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , - c.update_by ,c.update_time + c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name from case_application c