From b18075b0c4633ae4d25fa1497e9b98babef6eb06 Mon Sep 17 00:00:00 2001 From: hejinbo Date: Wed, 8 Nov 2023 10:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A3=81=E5=86=B3=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdjudicationServiceImpl.java | 6 +-- .../impl/CaseArbitrateServiceImpl.java | 44 ++++++++++++++++--- 2 files changed, 42 insertions(+), 8 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 62d0f2e..ff37315 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 @@ -296,9 +296,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String month = String.format("%02d", now.getMonthValue()); String day = String.format("%02d", now.getDayOfMonth()); String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; - //String modalFilePath = "D:/develop/新裁决书模板.docx"; + // String modalFilePath = "D:/develop/新裁决书模板.docx"; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; - //String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; + // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx"; String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; String resultFilePath = saveFolderPath + "/" + fileName; @@ -729,7 +729,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { //财产保全 Integer properPreser = caseApplication1.getProperPreser(); String preservation = "本案受理后，申请人向仲裁委提交了财产保全申请，仲裁委根据《中华人民共和国仲裁法》" + - "第二十八条之规定，将该申请提交至XXX市XXX区法院。"; + "第二十八条之规定，将该申请提交至法院。"; if (properPreser == null) { datas.put("preservation", null); } else if (properPreser == 1) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 65bb975..3a9f0d8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.wisdomarbitrate.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.deepoove.poi.data.PictureRenderData; import com.ruoyi.common.constant.CaseApplicationConstants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; @@ -8,6 +9,7 @@ import com.ruoyi.common.utils.WordUtil; import com.ruoyi.wisdomarbitrate.domain.*; import com.ruoyi.wisdomarbitrate.mapper.*; import com.ruoyi.wisdomarbitrate.service.IAdjudicationService; +import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService; import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils; import com.ruoyi.common.utils.SmsUtils; import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService; @@ -28,6 +30,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.*; import java.util.function.Function; +import java.util.regex.Pattern; import java.util.stream.Collectors; import static com.ruoyi.common.utils.SecurityUtils.getUsername; @@ -50,6 +53,8 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { private IAdjudicationService adjudicationService; @Autowired private RedisCache redisCache; + @Autowired + private ICaseApplicationService caseApplicationService; @Override @Transactional @@ -346,7 +351,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } else if (identityType == 2) { //被申请人 datas.put("resName", affiliate.getName()); datas.put("resAddress", affiliate.getResidenAffili()); - datas.put("resSex", affiliate.getResponSex()); + String responSex = affiliate.getResponSex(); + if (responSex.equals("0")) { + datas.put("resSex", "男"); + } else { + datas.put("resSex", "女"); + } Date responBirth = affiliate.getResponBirth(); if (responBirth != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -495,10 +505,34 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } datas.put("claims", caseApplication1.getArbitratClaims()); datas.put("request", caseApplication1.getRequestRule()); - //申请人证据材料 - datas.put("appEvidenceMaterial", null); - //被申请人证据材料 - datas.put("resEvidenceMaterial", null); + CaseApplication caseApplication2 = caseApplicationService.selectCaseApplication(caseApplication); + List caseAttachList1 = caseApplication2.getCaseAttachList(); + if (caseAttachList1 != null && caseAttachList1.size() > 0) { + for (CaseAttach caseAttach : caseAttachList1) { + if (caseAttach.getAnnexType() == 6) { //被申请人证据材料 + String annexName = caseAttach.getAnnexName(); + boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); + if (isImageFile) { + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); + System.out.println("路径是===========" + annexPath); + PictureRenderData pictureRenderData = WordUtil + .rebuildImageContent(100, 100, null, annexPath); + datas.put("resEvidenceMaterial", pictureRenderData); + } + } else if (caseAttach.getAnnexType() == 2) { //申请人证据材料 + String annexName = caseAttach.getAnnexName(); + boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); + if (isImageFile) { + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); + System.out.println("路径是===========" + annexPath); + PictureRenderData pictureRenderData = WordUtil + .rebuildImageContent(100, 100, null, annexPath); + //申请人证据材料 + datas.put("appEvidenceMaterial", pictureRenderData); + } + } + } + } datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); if (arbitrateRecord1 != null) { datas.put("factDetermi", arbitrateRecord1.getFactDetermi());