From 44036df8b64f0437fc594bf9b86a1b44e3d2564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Nov 2023 10:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=8E=86=E5=8F=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mybatis/MybatisInterceptor.java | 10 ++++++++ .../modules/laws/common/util/DateUtil.java | 23 +++++++++++++++++++ ...LawsHomeNormalSearchHistoryController.java | 8 +++++++ .../entity/LawsHomeNormalSearchHistory.java | 4 ++-- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java b/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java index 05b35e82..beefc761 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java @@ -130,6 +130,16 @@ public class MybatisInterceptor implements Interceptor { ReflectionUtils.setField(field,parameter,sysUser.getOrgCode()); } } + // 注入逻辑删除默认值 + if ("delFlag".equals(field.getName())) { + ReflectionUtils.makeAccessible(field); + Object localDelFlag = ReflectionUtils.getField(field,parameter); + if (localDelFlag == null || "".equals(localDelFlag)) { + // 登录人账号 + ReflectionUtils.makeAccessible(field); + ReflectionUtils.setField(field,parameter,"0"); + } + } } catch (Exception e) { log.error("异常", e); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java index 59e021e0..454db61b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java @@ -136,4 +136,27 @@ public class DateUtil { return dayStrings; } + + /** + * + * @author LQT + * @date 2023/11/16 9:24 + * @param d 当前时间 + * @param i 月份个月 比如 -3 为当前时间的前三个月 3 为当前时间后三个月 + * @return java.util.List + */ + public static String getLastDate(Date d, int i) { + //得到日历 + Calendar calendar = Calendar.getInstance(); + //把当前时间赋给日历 + calendar.setTime(d); + //设置为前3月 + calendar.add(Calendar.MONTH, i); + //得到前3月的时间 + Date dBefore = calendar.getTime(); + //设置时间格式 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + //格式化前3月的时间 + return sdf.format(dBefore); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java index 16166d10..0256bda8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java @@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.MessageUtils; import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; import io.swagger.annotations.Api; @@ -21,7 +22,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; import java.util.Map; @@ -53,6 +57,10 @@ public class LawsHomeNormalSearchHistoryController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchHistory, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); + // 三月前 + String lastDate = DateUtil.getLastDate(new Date(), -3); + queryWrapper.ge("create_time",lastDate + " 00:00:00"); + queryWrapper.orderByDesc("id"); IPage pageList = lawsHomeNormalSearchHistoryService.page(page,queryWrapper); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java index 4ed973ec..d68b7315 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java @@ -46,8 +46,8 @@ public class LawsHomeNormalSearchHistory implements Serializable { private String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy年MM月dd EEEE") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd EEEE") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private Date createTime;