From 8edecc0d0bddb4cb26eb2e507190677d492ea990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 18 Jul 2024 14:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketStandard/entity/LawsMarketStandard.java | 9 ++++++++- .../service/impl/LawsMarketStandardServiceImpl.java | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java index 8df2e6f2..dcdc09e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java @@ -120,7 +120,7 @@ public class LawsMarketStandard implements Serializable { */ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @ApiModelProperty(value = "作者") - @Excel(name = "发布时间", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id" ,needMerge = true) + @Excel(name = "作者", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id" ,needMerge = true) private String author; /** @@ -185,4 +185,11 @@ public class LawsMarketStandard implements Serializable { @ApiModelProperty(value = "流程查询标识") @TableField(exist = false) private String processFlag; + + /** + * 首页查询标识 + */ + @ApiModelProperty(value = "首页查询标识") + @TableField(exist = false) + private String homeFlag; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 710c30d5..b0760971 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -35,6 +35,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -83,6 +87,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); QueryWrapper queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard); if(StringUtils.isBlank(marketStandard.getProcessFlag())){ + if(!StringUtils.isBlank(marketStandard.getHomeFlag())){ + LocalDate currentDate = LocalDate.now(); + // 前90天的日期 + LocalDate ninetyDaysAgo = currentDate.minus(90, ChronoUnit.DAYS); + LocalDateTime time = LocalDateTime.parse(ninetyDaysAgo.toString() + " 00:00:00", + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + queryWrapper.ge("ms.release_date", time); + } return marketStandardMapper.queryByPage(page, queryWrapper); }else{ queryWrapper.isNull("pms1.manifest_id");