From eff4c740aa624f24e7d9e669d802a499512e0604 Mon Sep 17 00:00:00 2001 From: hejinbo Date: Tue, 17 Oct 2023 18:27:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?10.17=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdjudicationServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 2e2e26e..7ec1056 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -77,6 +77,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { CaseAffiliate caseAffiliate = new CaseAffiliate(); caseAffiliate.setCaseAppliId(id); List caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); + List nameAgentList = new ArrayList<>(); if (caseAffiliates != null && caseAffiliates.size() > 0) { for (CaseAffiliate affiliate : caseAffiliates) { //获取身份类型 @@ -89,12 +90,14 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost()); datas.put("appAgentName", affiliate.getNameAgent()); datas.put("appAgentTitle", null); + nameAgentList.add(affiliate.getNameAgent()); } else if (identityType == 2) { //被申请人 datas.put("resName", affiliate.getName()); datas.put("resAddress", affiliate.getContactAddress()); datas.put("resSex", affiliate.getResponSex()); datas.put("resDateOfBirth", affiliate.getResponBirth()); datas.put("resContactAddress", null); + nameAgentList.add(affiliate.getNameAgent()); } } } @@ -163,7 +166,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } Integer isAbsence = caseApplication1.getIsAbsence(); if (isAbsence==null){ - datas.put("onLine1", null); + datas.put("absent1", null); datas.put("absent2", null); datas.put("absent3", null); datas.put("absent4", null); @@ -175,7 +178,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("attend5", null); datas.put("attend6", null); datas.put("attend7", null); - datas.put("responCrossOpin", null); + datas.put("appAgentName1", null); + datas.put("appAgentName2", null); + datas.put("resAgentName", null); } else if (isAbsence == 1) { //缺席审理 @@ -188,11 +193,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService { "申请人为证明其主张的事实和理由，向仲裁庭提交了如下证据材料："; String absent5 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" + "第四十条第（二）项、第五十一条的规定，缺席裁决如下："; - datas.put("onLine1", absent1); + datas.put("absent1", absent1); datas.put("absent2", absent2); datas.put("absent3", absent3); datas.put("absent4", absent4); datas.put("absent5", absent5); + datas.put("appAgentName1", nameAgentList.get(0)); } else { //出席审理 String attend1 = "申请人的特别授权委托代理人"; @@ -214,6 +220,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("attend6", attend6); datas.put("attend7", attend7); datas.put("responCrossOpin", caseApplication1.getResponCrossOpin()); + datas.put("appAgentName2", nameAgentList.get(0)); + datas.put("resAgentName", nameAgentList.get(1)); if (arbitratMethod == 1) { //被申出席+开庭 String attend8 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" + @@ -243,7 +251,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("year", year); String month = String.format("%02d", now.getMonthValue()); String day = String.format("%02d", now.getDayOfMonth()); - String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; + String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; //String modalFilePath = "D:/develop/新裁决书模板.docx"; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; //String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; -- 2.54.0 From 953410c5dfbc437aefa91371b25efa63792aa421 Mon Sep 17 00:00:00 2001 From: hejinbo Date: Wed, 18 Oct 2023 10:22:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/domain/CaseAffiliate.java | 8 +++++--- .../service/impl/AdjudicationServiceImpl.java | 15 +++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java index 9c72b6f..b42ef07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java @@ -3,6 +3,8 @@ package com.ruoyi.wisdomarbitrate.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + public class CaseAffiliate extends BaseEntity { private static final long serialVersionUID = 1L; /** ID */ @@ -39,7 +41,7 @@ public class CaseAffiliate extends BaseEntity { /** * 被申请人出生年月日 */ - private String responBirth; + private Date responBirth; public String getCompLegalPerson() { return compLegalPerson; @@ -65,11 +67,11 @@ public class CaseAffiliate extends BaseEntity { this.responSex = responSex; } - public String getResponBirth() { + public Date getResponBirth() { return responBirth; } - public void setResponBirth(String responBirth) { + public void setResponBirth(Date responBirth) { this.responBirth = responBirth; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 7ec1056..554f896 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -84,19 +84,22 @@ public class AdjudicationServiceImpl implements IAdjudicationService { int identityType = affiliate.getIdentityType(); if (identityType == 1) { //申请人 datas.put("appName", affiliate.getName()); - datas.put("appAddress", affiliate.getContactAddress()); - datas.put("appContactAddress", null); + datas.put("appAddress", affiliate.getResidenAffili()); + datas.put("appContactAddress", affiliate.getContactAddress()); datas.put("appLegalPerson", affiliate.getCompLegalPerson()); datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost()); datas.put("appAgentName", affiliate.getNameAgent()); - datas.put("appAgentTitle", null); + datas.put("appAgentTitle", affiliate.getAppliAgentTitle()); nameAgentList.add(affiliate.getNameAgent()); } else if (identityType == 2) { //被申请人 datas.put("resName", affiliate.getName()); - datas.put("resAddress", affiliate.getContactAddress()); + datas.put("resAddress", affiliate.getResidenAffili()); datas.put("resSex", affiliate.getResponSex()); - datas.put("resDateOfBirth", affiliate.getResponBirth()); - datas.put("resContactAddress", null); + Date responBirth = affiliate.getResponBirth(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String responBirthStr = sdf.format(responBirth); + datas.put("resDateOfBirth",responBirthStr); + datas.put("resContactAddress", affiliate.getContactAddress()); nameAgentList.add(affiliate.getNameAgent()); } } -- 2.54.0