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 aeb4f62..abd91aa 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 @@ -53,6 +53,7 @@ public class CaseAffiliate extends BaseEntity { this.responBirth = responBirth; } + public String getCompLegalPerson() { return compLegalPerson; } @@ -79,6 +80,7 @@ public class CaseAffiliate extends BaseEntity { + /** 身份证号 */ @Excel(name = "身份证号") private String identityNum; 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 044854d..efa26b5 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 @@ -78,24 +78,30 @@ 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) { //获取身份类型 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()); } } } @@ -164,7 +170,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); @@ -176,7 +182,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) { //缺席审理 @@ -189,11 +197,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 = "申请人的特别授权委托代理人"; @@ -215,6 +224,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日起施行的版本)" + @@ -244,7 +255,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;