From e7695e480d90dce70222ffd997e90e028f8f432b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 4 Dec 2023 20:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A3=80=E7=B4=A2=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsHomeSearchServiceImpl.java | 19 ++++++++++++------- .../laws/home/vo/LawsHomeNormalSearchVO.java | 4 ++-- 2 files changed, 14 insertions(+), 9 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 e85bb3cf..b6b7b46a 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 @@ -1031,8 +1031,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { case "7": obj.setStandardStateOrder("3");break; default: obj.setStandardTypeOrder("");break; } - obj.setImplementationDate(lawsDomesticStandard.getImplementationDate()); - obj.setCreateTime(lawsDomesticStandard.getCreateTime()); + obj.setImplementationDate(getImplementationDate(lawsDomesticStandard.getImplementationDate())); + obj.setCreateTime(getImplementationDate(lawsDomesticStandard.getCreateTime())); obj.setReleaseDate(lawsDomesticStandard.getReleaseDate()); obj.setStandardClass(lawsDomesticStandard.getStandardClass()); obj.setDynamicType(lawsDomesticStandard.getDynamicType()); @@ -1121,8 +1121,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { case "7": obj.setStandardStateOrder("3");break; default: obj.setStandardTypeOrder("");break; } - obj.setImplementationDate(lawsOverseasStandard.getImplementationDate()); - obj.setCreateTime(lawsOverseasStandard.getCreateTime()); + obj.setImplementationDate(getImplementationDate(lawsOverseasStandard.getImplementationDate())); + obj.setCreateTime(getImplementationDate(lawsOverseasStandard.getCreateTime())); obj.setReleaseDate(lawsOverseasStandard.getReleaseDate()); obj.setStandardClass(lawsOverseasStandard.getStandardClass()); @@ -1209,8 +1209,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { case "7": obj.setStandardStateOrder("3");break; default: obj.setStandardTypeOrder("");break; } - obj.setImplementationDate(lawsEnterpriseStandard.getImplementationDate()); - obj.setCreateTime(lawsEnterpriseStandard.getCreateTime()); + obj.setImplementationDate(getImplementationDate(lawsEnterpriseStandard.getImplementationDate())); + obj.setCreateTime(getImplementationDate(lawsEnterpriseStandard.getCreateTime())); obj.setReleaseDate(lawsEnterpriseStandard.getReleaseDate()); obj.setStandardState(lawsEnterpriseStandard.getStandardState()); obj.setStandardCode(lawsEnterpriseStandard.getStandardCode()); @@ -1227,6 +1227,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { } } + @NotNull + private String getImplementationDate(Date implementationDate) { + return Objects.isNull(implementationDate) ? "" : new SimpleDateFormat(YYYY_MM_DD).format(implementationDate); + } + @NotNull private List getOssFilesLawsEnterpriseStandard(LawsEnterpriseStandard lawsEnterpriseStandard) { // 从过程稿件从上到下顺序检索；如果文档里有发布稿，只检索发布稿 @@ -1280,7 +1285,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { obj.setResourceType(resourceType); obj.setStandardTypeOrder("9"); obj.setReleaseDate(lawsNewsFeed.getReleaseTime()); - obj.setCreateTime(lawsNewsFeed.getCreateTime()); + obj.setCreateTime(getImplementationDate(lawsNewsFeed.getCreateTime())); updateESLawsNewsFeed(opType, lawsNewsFeed, obj); }catch (Exception e){ log.error(SYNC_ES_ERR,e.getMessage()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java index cc914674..0a995911 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java @@ -97,9 +97,9 @@ public class LawsHomeNormalSearchVO implements Serializable { /** * 实施时间 */ - private Date implementationDate; + private String implementationDate; /** * 实施时间 */ - private Date createTime; + private String createTime; }