fix:79132

laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java

@@ -3,11 +3,8 @@ package com.jero.modules.laws.common.util;
 import com.jero.common.exception.JeroBootException;
 
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -138,14 +135,14 @@ public class DateUtil {
     }
 
     /**
-    *
+    * 加减 月份
     * @author LQT
     * @date 2023/11/16 9:24
      * @param d 当前时间
      * @param i 月份个月 比如 -3 为当前时间的前三个月   3 为当前时间后三个月
     * @return java.util.List<java.lang.String>
     */
-    public static String getLastDate(Date d, int i) {
+    public static String getLastDateByMon(Date d, int i) {
         //得到日历
         Calendar calendar = Calendar.getInstance();
         //把当前时间赋给日历
@@ -159,4 +156,27 @@ public class DateUtil {
         //格式化前3月的时间
         return sdf.format(dBefore);
     }
+
+    /**
+     * 加减 天
+     * @author LQT
+     * @date 2023/11/16 9:24
+     * @param d 当前时间
+     * @param i 天数 比如 -3 为当前时间的前三个天   3 为当前时间后三个天
+     * @return java.util.List<java.lang.String>
+     */
+    public static String getLastDateByDay(Date d, int i) {
+        //得到日历
+        Calendar calendar = Calendar.getInstance();
+        //把当前时间赋给日历
+        calendar.setTime(d);
+        //设置为前3月
+        calendar.add(Calendar.DAY_OF_YEAR, i);
+        //得到前3月的时间
+        Date dBefore = calendar.getTime();
+        //设置时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //格式化前3月的时间
+        return sdf.format(dBefore);
+    }
 }

laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 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;
@@ -24,9 +24,7 @@ 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;
 
@@ -60,7 +58,7 @@ public class LawsHomeNormalSearchHistoryController extends JeroController<LawsHo
         QueryWrapper<LawsHomeNormalSearchHistory> queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchHistory, req.getParameterMap());
         Page<LawsHomeNormalSearchHistory> page = new Page<>(pageNo, pageSize);
         // 三月前
-        String lastDate = DateUtil.getLastDate(new Date(), -3);
+        String lastDate = DateUtil.getLastDateByDay(new Date(), -90);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         queryWrapper.eq("create_by",sysUser.getUsername());
         queryWrapper.ge("create_time",lastDate + " 00:00:00");

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -586,8 +586,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         // 添加检索历史
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory = new LawsHomeNormalSearchHistory();
+        BeanUtils.copyProperties(homeNormalSearchDTO,lawsHomeNormalSearchHistory);
         lawsHomeNormalSearchHistory.setUserId(loginUser.getId());
-        lawsHomeNormalSearchHistory.setSearchContent(searchContent);
         lawsHomeNormalSearchHistoryService.save(lawsHomeNormalSearchHistory);
 
         if(StringUtils.isBlank(searchContent)){