From 7bc9b1d4cb08d97e18cb7b40ef537cea069fb95d Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 9 Oct 2023 17:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=89=B9=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CaseApplication.java | 146 ++++++++++++++++-- .../wisdomarbitrate/domain/vo/CaseLogVO.java | 29 ++++ .../impl/CaseApplicationServiceImpl.java | 34 +++- 3 files changed, 192 insertions(+), 17 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java 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 e54db68..44df51c 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 @@ -326,36 +326,78 @@ public class CaseApplication extends BaseEntity { } /** 身份类型 */ - @Excel(name = "身份类型") +// @Excel(name = "身份类型") private int identityType; + /** + * 申请人主体信息 + */ /** 姓名 */ - @Excel(name = "姓名") + @Excel(name = "申请人主体信息-申请人姓名",width = 26) private String name; /** 身份证号 */ - @Excel(name = "身份证号") + @Excel(name = "申请人主体信息-身份证号",width = 26) private String identityNum; - /** 单位电话 */ - @Excel(name = "单位电话") - private String workTelphone; + /** 联系电话 */ - @Excel(name = "联系电话") + @Excel(name = "申请人主体信息-联系电话",width = 26) private String contactTelphone; /** 联系地址 */ - @Excel(name = "联系地址") + @Excel(name = "申请人主体信息-联系地址",width = 26) private String contactAddress; + /** 单位电话 */ + @Excel(name = "申请人主体信息-单位电话",width = 26) + private String workTelphone; /** 单位地址 */ - @Excel(name = "单位地址") + @Excel(name = "申请人主体信息-单位地址",width = 26) private String workAddress; /** 代理人姓名 */ - @Excel(name = "代理人姓名") + @Excel(name = "申请人主体信息-代理人姓名",width = 26) private String nameAgent; /** 身份证号 */ - @Excel(name = "代理人身份证号") + @Excel(name = "申请人主体信息-代理人身份证号",width = 26) private String identityNumAgent; /** 联系电话 */ - @Excel(name = "代理人联系电话") + @Excel(name = "申请人主体信息-代理人联系电话",width = 26) private String contactTelphoneAgent; + /** 联系地址 */ + @Excel(name = "申请人主体信息-代理人联系地址",width = 26) + private String contactAddressAgent; + /** + * 被申请人主体信息 + */ + /** 姓名 */ + @Excel(name = "被申请人主体信息-申请人姓名",width = 26) + private String debtorName; + /** 身份证号 */ + @Excel(name = "被申请人主体信息-身份证号",width = 26) + private String debtorIdentityNum; + + /** 联系电话 */ + @Excel(name = "被申请人主体信息-联系电话",width = 26) + private String debtorContactTelphone; + /** 联系地址 */ + @Excel(name = "被申请人主体信息-联系地址",width = 26) + private String debtorContactAddress; + /** 单位电话 */ + @Excel(name = "被申请人主体信息-单位电话",width = 26) + private String debtorWorkTelphone; + /** 单位地址 */ + @Excel(name = "被申请人主体信息-单位地址",width = 26) + private String debtorWorkAddress; + + /** 代理人姓名 */ + @Excel(name = "被申请人主体信息-代理人姓名",width = 26) + private String debtorNameAgent; + /** 身份证号 */ + @Excel(name = "被申请人主体信息-代理人身份证号",width = 26) + private String debtorIdentityNumAgent; + /** 联系电话 */ + @Excel(name = "被申请人主体信息-代理人联系电话",width = 26) + private String debtorContactTelphoneAgent; + /** 联系地址 */ + @Excel(name = "被申请人主体信息-代理人联系地址",width = 26) + private String debtorContactAddressAgent; public int getIdentityType() { return identityType; @@ -445,12 +487,86 @@ public class CaseApplication extends BaseEntity { this.contactAddressAgent = contactAddressAgent; } - /** 联系地址 */ - @Excel(name = "代理人联系地址") - private String contactAddressAgent; + public String getDebtorName() { + return debtorName; + } + public void setDebtorName(String debtorName) { + this.debtorName = debtorName; + } + public String getDebtorIdentityNum() { + return debtorIdentityNum; + } + + public void setDebtorIdentityNum(String debtorIdentityNum) { + this.debtorIdentityNum = debtorIdentityNum; + } + + public String getDebtorContactTelphone() { + return debtorContactTelphone; + } + + public void setDebtorContactTelphone(String debtorContactTelphone) { + this.debtorContactTelphone = debtorContactTelphone; + } + + public String getDebtorContactAddress() { + return debtorContactAddress; + } + + public void setDebtorContactAddress(String debtorContactAddress) { + this.debtorContactAddress = debtorContactAddress; + } + + public String getDebtorWorkTelphone() { + return debtorWorkTelphone; + } + + public void setDebtorWorkTelphone(String debtorWorkTelphone) { + this.debtorWorkTelphone = debtorWorkTelphone; + } + + public String getDebtorWorkAddress() { + return debtorWorkAddress; + } + + public void setDebtorWorkAddress(String debtorWorkAddress) { + this.debtorWorkAddress = debtorWorkAddress; + } + + public String getDebtorNameAgent() { + return debtorNameAgent; + } + + public void setDebtorNameAgent(String debtorNameAgent) { + this.debtorNameAgent = debtorNameAgent; + } + + public String getDebtorIdentityNumAgent() { + return debtorIdentityNumAgent; + } + + public void setDebtorIdentityNumAgent(String debtorIdentityNumAgent) { + this.debtorIdentityNumAgent = debtorIdentityNumAgent; + } + + public String getDebtorContactTelphoneAgent() { + return debtorContactTelphoneAgent; + } + + public void setDebtorContactTelphoneAgent(String debtorContactTelphoneAgent) { + this.debtorContactTelphoneAgent = debtorContactTelphoneAgent; + } + + public String getDebtorContactAddressAgent() { + return debtorContactAddressAgent; + } + + public void setDebtorContactAddressAgent(String debtorContactAddressAgent) { + this.debtorContactAddressAgent = debtorContactAddressAgent; + } public Long getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java new file mode 100644 index 0000000..7169864 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java @@ -0,0 +1,29 @@ +package com.ruoyi.wisdomarbitrate.domain.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @description 案件操作日志实体 + * @Author wangqiong + * @Date 2023/10/09 15:18 + * @Version V1.0 + **/ +@Data +public class CaseLogVO { + /**日志id*/ + private String logId; + /**操作人id*/ + private String operatorId; + /**操作人名称*/ + private String operatorName; + /**操作人ip*/ + private String ip; + /**操作时间*/ + private Date operateTime; + /**操作明细*/ + private String operateDetail; + /**操作类型*/ + private String operateType; +} 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 dbac33a..3d110fe 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 @@ -249,6 +249,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { for (int i = 0; i < caseApplicationListinsert.size(); i++){ caseApplicationNewList = new ArrayList<>(); CaseApplication caseApplicationinsertDiffer = caseApplicationListinsert.get(i); + // 设置自动编码 + caseApplicationinsertDiffer.setCaseNum(generateCaseNum()); List caseAffiliatesnew = new ArrayList<>(); CaseApplication caseApplicationNew = new CaseApplication(); copyCaseApplication(caseApplicationinsertDiffer,caseApplicationNew); @@ -270,8 +272,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { CaseApplication caseApplicationItera = caseApplicationNewList.get(k); // 新增立案信息 caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); - // 设置自动编码 - caseApplicationItera.setCaseNum(generateCaseNum()); + int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera); List caseAffiliates = caseApplicationItera.getCaseAffiliates(); if(caseAffiliates!=null&&caseAffiliates.size()>0){ @@ -510,12 +511,41 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { private void assignmentCaseAffiliates(CaseApplication caseApplication, List caseAffiliatesnew) { CaseAffiliate caseAffiliate = new CaseAffiliate(); + // BeanUtils.copyBeanProp(caseApplication,caseAffiliate); BeanUtils.copyBeanProp(caseAffiliate,caseApplication); + caseAffiliate.setIdentityType(1); caseAffiliatesnew.add(caseAffiliate); + + // 组装被申请人信息 + caseAffiliatesnew.add( buildDebtorInfo(caseApplication)); caseApplication.setCaseAffiliates(caseAffiliatesnew); } + /** + * 组装被申请人信息 + * @param caseApplication + * @return + */ + + private CaseAffiliate buildDebtorInfo(CaseApplication caseApplication) { + // 被申请人信息 + CaseAffiliate debtorCaseAffiliate = new CaseAffiliate(); + debtorCaseAffiliate.setCaseAppliId(caseApplication.getId()); + debtorCaseAffiliate.setIdentityType(2); + debtorCaseAffiliate.setName(caseApplication.getDebtorName()); + debtorCaseAffiliate.setIdentityNum(caseApplication.getDebtorIdentityNum()); + debtorCaseAffiliate.setContactTelphone(caseApplication.getDebtorContactTelphone()); + debtorCaseAffiliate.setContactAddress(caseApplication.getDebtorContactAddress()); + debtorCaseAffiliate.setWorkTelphone(caseApplication.getDebtorWorkTelphone()); + debtorCaseAffiliate.setWorkAddress(caseApplication.getDebtorWorkAddress()); + debtorCaseAffiliate.setNameAgent(caseApplication.getDebtorNameAgent()); + debtorCaseAffiliate.setIdentityNumAgent(caseApplication.getDebtorIdentityNumAgent()); + debtorCaseAffiliate.setContactTelphoneAgent(caseApplication.getDebtorContactTelphoneAgent()); + debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent()); + return debtorCaseAffiliate; + } + private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) { caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims()); caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());