From 5a80b32b390b2c8c8f46e1b12ac07452a293d528 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 7 May 2024 16:38:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20PDM=20496=E6=8E=A5=E5=8F=A3BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../srms/service/impl/SrmsApiServiceImpl.java | 28 ++++++++++++++----- .../modules/docking/srms/vo/StandardVO.java | 9 +++++- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java index ea961567..dd3c4610 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java @@ -31,11 +31,11 @@ import com.jero.modules.docking.bindPart.service.ILawsBindPartService; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; import com.jero.modules.laws.documenttool.mapper.LawsDocumentSplitMapper; import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.entity.PartName; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.laws.standard.service.ILawsTreeNodeService; -import com.jero.modules.laws.standard.service.PartNameService; +import com.jero.modules.laws.standard.service.*; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -110,6 +110,12 @@ public class SrmsApiServiceImpl implements SrmsApiService { @Resource private ILawsEnterpriseStandardService esService; + @Resource + private ILawsDomesticStandardService gbService; + + @Resource + private ILawsOverseasStandardService fbService; + @Value("${srms.font_url_pdf}") private String fontUrlPdf; @Value("${srms.back_url_pdf}") @@ -921,13 +927,21 @@ public class SrmsApiServiceImpl implements SrmsApiService { if (!CollectionUtils.isEmpty(lawsBindPartList)) { // 设置标准名称 Set standardIdSet = lawsBindPartList.stream().map(LawsBindPart::getStandardId).collect(Collectors.toSet()); - List lawsStandardList = esService.listByIds(standardIdSet); - for (LawsEnterpriseStandard es : lawsStandardList) { + List lawsStandardList = new ArrayList<>(); + List esStandardList = esService.listByIds(standardIdSet); + List gbStandardList = gbService.listByIds(standardIdSet); + List fbStandardList = fbService.listByIds(standardIdSet); + // 将三种标准集合转换为通用VO + lawsStandardList.addAll(esStandardList.stream().map(e -> new StandardVO(e.getStandardNumber(), e.getStandardName())).collect(Collectors.toList())); + lawsStandardList.addAll(gbStandardList.stream().map(e -> new StandardVO(e.getStandardNumber(), e.getStandardName())).collect(Collectors.toList())); + lawsStandardList.addAll(fbStandardList.stream().map(e -> new StandardVO(e.getStandardNumber(), e.getStandardName())).collect(Collectors.toList())); + + for (StandardVO standard : lawsStandardList) { JSONObject rows = new JSONObject(); rows.put("PartNum", lawsBindPartList.get(0).getPartName()); rows.put("PartName", lawsBindPartList.get(0).getPartName()); - rows.put("StandardNumber", es.getStandardNumber()); - rows.put("StandardName", es.getStandardName()); + rows.put("StandardNumber", standard.getStandardNumber()); + rows.put("StandardName", standard.getStandardName()); rows.put("Remark1", ""); rows.put("Remark2", ""); rows.put("Remark3", ""); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/vo/StandardVO.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/vo/StandardVO.java index 9bac12cb..4ef53a2b 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/vo/StandardVO.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/vo/StandardVO.java @@ -1,6 +1,8 @@ package com.jero.modules.docking.srms.vo; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -10,6 +12,8 @@ import java.io.Serializable; * @date 2024/1/19 14:58 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class StandardVO implements Serializable { /** @@ -37,5 +41,8 @@ public class StandardVO implements Serializable { */ private String hasSplit; - + public StandardVO(String standardNumber, String standardName) { + this.standardNumber = standardNumber; + this.standardName = standardName; + } }