feat:筛选条件v2

src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java

@@ -25,7 +25,7 @@ public class GetRepalBillPageDTO extends PageRequest {
     @ApiModelProperty("排序类型。1日期升序。2日期降序。3总金额升序。4总金额降序")
     private Integer sortedType;
 
-    @ApiModelProperty("到期时间,[1]今天, [2]本周, [3]本月, [4]本年")
+    @ApiModelProperty("到期时间,[1]今天, [2]本周(近7天), [3]本月(近30天), [4]本年")
     private Integer overdueType;
 
     @ApiModelProperty(value = "自定义开始日期yyyy-MM-dd,string")

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -145,12 +145,12 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
                     billPageBO.setEndDate(billPageBO.getStartDate());
                     break;
                 case 2:
-                    billPageBO.setStartDate(LocalDate.now().with(DayOfWeek.MONDAY));
-                    billPageBO.setEndDate(LocalDate.now().with(DayOfWeek.SUNDAY));
+                    billPageBO.setStartDate(LocalDate.now().minusDays(7));
+                    billPageBO.setEndDate(LocalDate.now());
                     break;
                 case 3:
-                    billPageBO.setStartDate(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()));
-                    billPageBO.setEndDate(LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()));
+                    billPageBO.setStartDate(LocalDate.now().minusDays(30));
+                    billPageBO.setEndDate(LocalDate.now());
                     break;
                 case 4:
                     billPageBO.setStartDate(LocalDate.now().with(TemporalAdjusters.firstDayOfYear()));

src/main/java/com/winhc/repal/service/impl/RepalRemindHistoryServiceImpl.java

@@ -351,10 +351,10 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         }
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
-        if (StrUtil.isNotBlank(dto.getTimeSlot()) && Dict.TIME_SLOT_ENUM.本月.getCode().equals(dto.getTimeSlot())) {
-            localDateTime = LocalDateTime.now().minusDays(30);
-        }else if(StrUtil.isNotBlank(dto.getTimeSlot()) && Dict.TIME_SLOT_ENUM.本周.getCode().equals(dto.getTimeSlot())){
-            localDateTime = LocalDateTime.now().minusDays(7);
+        if (Dict.TIME_SLOT_ENUM.本月.getCode().equals(dto.getTimeSlot())) {
+            localDateTime = LocalDateTime.now().minusDays(30).withHour(0).withMinute(0).withSecond(0);
+        }else if(Dict.TIME_SLOT_ENUM.本周.getCode().equals(dto.getTimeSlot())){
+            localDateTime = LocalDateTime.now().minusDays(7).withHour(0).withMinute(0).withSecond(0);
         }
         VOPage<RepalRemindHistoryVO> result = new VOPage<>(pageNum,pageSize,0L,new ArrayList<>());
         LambdaQueryWrapper<RepalRemindHistory> qw = Wrappers.lambdaQuery(RepalRemindHistory.class);