From e7502c5b52a3ec54b237a3026d2dfb114e3c956d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 19 Sep 2024 17:56:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=87=BAsheet?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E6=9B=BF=E6=8D=A2=E7=89=B9=E6=AE=8A=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/home/service/impl/LawsHomeSearchServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 0619e989..3b7f29f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1398,10 +1398,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { Map clauseSheet = new HashMap<>(); clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class); ExportParams exportParamss = new ExportParams(null, - lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," ") - .replace("\\"," ").replace("?"," ") - .replace("*"," ").replace("["," ") - .replace("]"," ").replace(":"," ")); + lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/","") + .replace("\\","").replace("?","") + .replace("*","").replace("[","") + .replace("]","").replace(":","")); exportParamss.setType(ExcelType.XSSF); clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss); clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS); From 9273ad5a15d2c07d9d384a9a658cc3adaa7959b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 20 Sep 2024 11:20:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E3=80=81=E4=BC=81=E6=A0=87=E7=BB=93=E6=9E=84=E6=A0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9=E3=80=81=E6=9D=A1=E6=AC=BE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 26 ++++++++++++------- .../impl/LawsHomeSearchServiceImpl.java | 5 ++++ .../LawsHomeAdvancedSearchExportExcelVO.java | 4 +-- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index c0012a61..b1956f4d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -92,6 +92,7 @@ import java.nio.file.Path; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -621,8 +622,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { **/ private List> processResultMapPageList(List> records, List fieldList) { List dictItemList = getDictItemList(fieldList); - List> resultMapList = new ArrayList<>(); - for (Map map : records) { + List> resultMapList = new CopyOnWriteArrayList<>(); + records.parallelStream().forEach(map->{ Map resultMap = new LinkedHashMap<>(); String id = (String) map.get("id"); String standardNumber = (String) map.get(FieldCommon.STANDARD_NUMBER); @@ -642,7 +643,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { processSpecificFieldValue(resultMap, key, value, id, standardNumber, fieldList); } resultMapList.add(resultMap); - } + }); return resultMapList; } @@ -2044,12 +2045,19 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 体系 String standardSystem = (String) parameterMap.get(FieldCommon.STANDARD_SYSTEM); if (StrUtil.isNotBlank(standardSystem)) { - idSearch = true; - LambdaQueryWrapper standSystemWrapper = new LambdaQueryWrapper<>(); - List standSystemIdList = Arrays.asList(standardSystem.split(",")); - standSystemWrapper.in(LawsNodeRelation::getNodeId, standSystemIdList); - List systemList = lawsNodeRelationService.list(standSystemWrapper); - idSet.addAll(systemList.stream().map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.toSet())); + if (FieldCommon.MY_COLLECTION.equals(standardSystem)) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + selectCondition.append(" and id in (select distinct standard_id from laws_standard_collection" + + " where collector_id = '" + loginUser.getId() + "')"); + } else { + List standardSystemList = Arrays.asList(standardSystem.split(",")); + String str = String.join(",",standardSystemList).replace(",","','"); + selectCondition.append(" and id in (select distinct l2.unique_relation_flag from " + + " (select node_code from laws_node_relation where node_id in ('") + .append(str).append("') ") + .append(" group by node_code) l1 left join laws_node_relation l2 " + + " on l2.node_code like CONCAT(l1.node_code,'%')) "); + } parameterMap.remove(FieldCommon.STANDARD_SYSTEM); } Set listIntersection = new HashSet<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 3b7f29f5..a56177f8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1391,6 +1391,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { .map(SarFileSplitItemsValEO::getItemContent) .collect(Collectors.joining("\n\r")); lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents); + String translation = sarFileSplitItemsValEOS.stream() + .filter(v -> StringUtils.isNotBlank(v.getTranslation())) + .map(SarFileSplitItemsValEO::getTranslation) + .collect(Collectors.joining("\n\r")); + lawsHomeAdvancedSearchClauseExcelVO.setTranslation(translation); } }); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java index 27db8d8f..b36b505a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java @@ -48,8 +48,8 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable { * 实施日期 */ @ApiModelProperty(value = "实施日期") - @Excel(name = "实施日期", width = 20, format = "yyyy-MM-dd") - private Date implementationDate; + @Excel(name = "实施日期", width = 20) + private String implementationDate; /** * 在产车实施日期 * */