diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java new file mode 100644 index 0000000..d5779b8 --- /dev/null +++ b/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; + + + + +} 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 cef3dd4..cb4e0bc 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 @@ -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; @@ -200,6 +199,17 @@ public class CaseApplication extends BaseEntity { /** 案件仲裁员 */ private List arbitrators; + /** 仲裁记录 */ + private ArbitrateRecord arbitrateRecord; + + public ArbitrateRecord getArbitrateRecord() { + return arbitrateRecord; + } + + public void setArbitrateRecord(ArbitrateRecord arbitrateRecord) { + this.arbitrateRecord = arbitrateRecord; + } + public List getArbitrators() { return arbitrators; } @@ -455,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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitrateRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitrateRecordMapper.java new file mode 100644 index 0000000..c4aaa18 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitrateRecordMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.wisdomarbitrate.mapper; + +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; +import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; +import com.ruoyi.wisdomarbitrate.domain.CaseApplication; + +import java.util.List; + +public interface ArbitrateRecordMapper { + int insertArbitrateRecord(ArbitrateRecord arbitrateRecord); + + int updataArbitrateRecord(ArbitrateRecord arbitrateRecord); + + ArbitrateRecord selectArbitrateRecord(ArbitrateRecord arbitrateRecord); + + +} 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 9ee54f9..7e3c554 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 @@ -6,9 +6,11 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SmsUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.mapper.ArbitrateRecordMapper; import com.ruoyi.wisdomarbitrate.mapper.ArbitratorMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper; @@ -36,6 +38,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Autowired private ArbitratorMapper arbitratorMapper; + @Autowired + private ArbitrateRecordMapper arbitrateRecordMapper; @Override @@ -102,6 +106,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); CaseAffiliate caseAffiliate = new CaseAffiliate(); caseAffiliate.setCaseAppliId(caseApplication.getId()); + + ArbitrateRecord arbitrateRecord = new ArbitrateRecord(); + arbitrateRecord.setCaseAppliId(caseApplication.getId()); + ArbitrateRecord arbitrateRecordselect = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecord); + List caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); if(caseAffiliatListeselect!=null){ StringBuffer applicantName = new StringBuffer(); @@ -118,6 +127,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseApplicationselect.setApplicantName(applicantName.toString()); caseApplicationselect.setRespondentName(respondentName.toString()); caseApplicationselect.setCaseAffiliates(caseAffiliatListeselect); + caseApplicationselect.setArbitrateRecord(arbitrateRecordselect); } return caseApplicationselect; } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml new file mode 100644 index 0000000..689a926 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + insert into arbitrate_record( + case_appli_id, + eviden_determi, + fact_determi, + case_sketch, + ruling_follows, + verificaOpinion, + checkOpinion, + create_by, + create_time + )values( + #{caseAppliId}, + #{evidenDetermi}, + #{factDetermi}, + #{caseSketch}, + #{rulingFollows}, + #{verifica_opinion}, + #{check_opinion}, + #{createBy}, + sysdate() + ) + + + + + update arbitrate_record + + eviden_determi = #{evidenDetermi}, + fact_determi = #{factDetermi}, + case_sketch = #{caseSketch}, + arbitrate_think = #{arbitrateThink}, + ruling_follows = #{rulingFollows}, + verifica_opinion = #{verificaOpinion}, + check_opinion = #{checkOpinion}, + update_by = #{updateBy}, + update_time = sysdate() + + where id = #{id} + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index ec844ec..cd64524 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -20,7 +20,6 @@ - @@ -45,7 +44,7 @@ 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.paid_expenses ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , + c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , c.update_by ,c.update_time from case_application c @@ -84,7 +83,6 @@ claim_interest_owed, claim_liquid_damag, fee_payable, - paid_expenses, begin_video_date, online_video_person, @@ -130,7 +128,6 @@ claim_interest_owed = #{claimInterestOwed}, claim_liquid_damag = #{claimLiquidDamag}, fee_payable = #{feePayable}, - paid_expenses = #{paidExpenses}, begin_video_date = #{beginVideoDate}, online_video_person = #{onlineVideoPerson}, @@ -173,7 +170,7 @@