From d623d89e941ee782a7d31734517e8fa59e8f8032 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 2 Aug 2024 10:56:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(88014):=20=E9=AB=98=E7=BA=A7=E6=A3=80?= =?UTF-8?q?=E7=B4=A2-=E5=85=A8=E9=83=A8=20=E5=AF=B9=E4=BB=A5=E4=B8=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=9B=E8=A1=8C=E6=90=9C=E7=B4=A2=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/service/impl/LawsHomeSearchServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 580fec4d..995404a7 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 @@ -1544,7 +1544,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { // 构建搜索条件 String orderBy = "order by create_time desc"; parameterMapByDomestic.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); - parameterMapByEnterprise.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); + parameterMapByEnterprise.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + // 关联部门字段不一致 特殊处理 + if (parameterMap.containsKey("associate_dept")){ + parameterMapByEnterprise.put("related_department", parameterMap.get("associate_dept")); + } String queryConditionByDomestic = lawsCommonService.buildQueryCondition(parameterMapByDomestic).replace(orderBy, ""); String queryConditionByEnterprise = @@ -1573,6 +1577,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { Date releaseDate = (Date) data.get("release_date"); data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate)); } + if (!Objects.isNull(data.get("implementation_date"))){ + Date implementationDate = (Date) data.get("implementation_date"); + data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate)); + } } return Result.OK(advancedSearchAll); }