From 7eb500d071395944e6c47eb456c88e66905bda1f Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 9 Oct 2023 09:05:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=88=E4=BB=B6=E8=B5=84?= =?UTF-8?q?=E6=96=99=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E4=BA=BA?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=AF=81=E6=8D=AEbug=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E6=A1=88=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=A2=9E=E5=8A=A0=E7=94=B3=E8=AF=B7=E4=BA=BA=E4=BB=B2?= =?UTF-8?q?=E8=A3=81=E8=AF=89=E6=B1=82=E5=AD=97=E6=AE=B5=20=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CaseApplication.java | 1 + .../impl/CaseApplicationServiceImpl.java | 31 ++++++++++++++++++- .../wisdomarbitrate/CaseAffiliateMapper.xml | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) 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 673a8ff..9b6a830 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 @@ -59,6 +59,7 @@ public class CaseApplication extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date hearDate; /** 申请人仲裁诉求 */ + @Excel(name = "申请人仲裁诉求") private String arbitratClaims; /** 借款开始日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 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 a1400ab..5df14c2 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 @@ -92,9 +92,18 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { List caseAffiliates = caseApplication.getCaseAffiliates(); if(caseAffiliates!=null&&caseAffiliates.size()>0){ for (CaseAffiliate caseAffiliate : caseAffiliates){ + caseAffiliate.setCaseAppliId(caseApplication.getId()); caseAffiliateMapper.updataCaseAffiliate(caseAffiliate); } } + List caseAttachList = caseApplication.getCaseAttachList(); + if(caseAttachList!=null&&caseAttachList.size()>0){ + for (CaseAttach caseAttach : caseAttachList){ + caseAttach.setCaseAppliId(caseApplication.getId()); + caseAttachMapper.updateCaseAttach(caseAttach); + } + + } return rows; } @@ -194,6 +203,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseApplicationListinsert.add(caseApplication); } } + // 编号存在不导入 + if(StringUtils.isNotEmpty(failureMsg)){ + return failureMsg.toString(); + } if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){ List caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect( collectingAndThen( @@ -203,8 +216,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息 if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){ - List caseApplicationNewList = new ArrayList<>(); + List caseApplicationNewList = null; for (int i = 0; i < caseApplicationListinsertDiffer.size(); i++){ + caseApplicationNewList = new ArrayList<>(); CaseApplication caseApplicationinsertDiffer = caseApplicationListinsertDiffer.get(i); List caseAffiliatesnew = new ArrayList<>(); CaseApplication caseApplicationNew = new CaseApplication(); @@ -345,7 +359,22 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) { CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplicationConfirm(caseApplication); + CaseAffiliate caseAffiliate = new CaseAffiliate(); + caseAffiliate.setCaseAppliId(caseApplication.getId()); + List caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); + if(caseAffiliatListeselect!=null){ + StringBuffer applicantName = new StringBuffer(); + for (int i = 0; i < caseAffiliatListeselect.size(); i++){ + CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(i); + int identityType = caseAffiliateselect.getIdentityType(); + if(identityType==1){ + applicantName.append(caseAffiliateselect.getName()).append(",");; + } + } + caseApplicationselect.setApplicantName(applicantName.toString()); + + } return caseApplicationselect; } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml index 974b9f6..4c7762b 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml @@ -49,6 +49,7 @@ update case_affiliate set + case_appli_id=#{caseAppliId}, identity_type= #{identityType}, name = #{name}, identity_num = #{identityNum},