From ab2e18b18a42abc493793ee874ae67b8aa83ee13 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Jul 2022 15:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E5=A1=AB?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMonthlyReportWriteEO.java | 15 +++-------- .../report/entity/NewOpinionTemplateEO.java | 5 +--- .../report/entity/NewStandardTemplateEO.java | 10 ++------ .../LawsMonthlyReportWriteEOServiceImpl.java | 25 +++++++++++++------ 4 files changed, 23 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 92462c36b..16af6ede5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -128,25 +128,16 @@ public class LawsMonthlyReportWriteEO implements Serializable { private java.lang.String implementCar; /**发布日期*/ - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") - private java.util.Date issueTime; + private java.lang.String issueTime; /**新车型实施日期*/ - @Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") - private java.util.Date newCarImplementTime; + private java.lang.String newCarImplementTime; /**在产车实施日期*/ - @Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") - private java.util.Date productionCarImplementTime; + private java.lang.String productionCarImplementTime; /**主要内容中文*/ @Excel(name = "主要内容中文", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java index fcd2ec8d8..766d08c50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java @@ -82,10 +82,7 @@ public class NewOpinionTemplateEO implements Serializable { private java.lang.String standardNameEn; /**征求意见截止日期*/ - @Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "征求意见截止日期") - private java.util.Date expirationDate; + private java.lang.String expirationDate; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java index ca7363247..e680c4e80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java @@ -82,17 +82,11 @@ public class NewStandardTemplateEO implements Serializable { private java.lang.String standardNameEn; /**发布日期*/ - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") - private java.util.Date issueTime; + private java.lang.String issueTime; /**实施日期*/ - @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "实施日期") - private java.util.Date implementTime; + private java.lang.String implementTime; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 2377af0f0..8906e352a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -235,23 +236,31 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); //新征求意见清单模板 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); - List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + List newOpinionTemplateEOList = new ArrayList<>(); + if(lawsMonthlyReportIdList.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + } + //新发布标准清单模板 - LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); - qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); - List newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + List newStandardTemplateEOList = new ArrayList<>(); + if(lawsMonthlyReportIdList.size() != 0){ + LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); + qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + } + for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { //处理章节目录 if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); - }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); } }