feat:筛选条件

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

@@ -20,7 +20,7 @@ public class RepalCustomerQueryDTO extends PageDTO {
     @ApiModelProperty(value = "客户性质 1企业 2个人 3政府事业单位")
     private Integer custProperty;
 
-    @ApiModelProperty(value = "排序类型 1(默认)创建时间升序 2账款数量升序 3账款数量降序 4账款总金额升序 5账款总金额降序 ")
+    @ApiModelProperty(value = "排序类型 1(默认)创建时间升序 2账款数量升序 3账款数量降序 4账款总金额升序 5账款总金额降序 6创建时间倒序")
     private Integer sortType;
 
     //不开放

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

@@ -29,7 +29,7 @@ public class RepalRemindHistoryDTO {
     @ApiModelProperty(value = "提醒类型(不传或者传非枚举字段默认全部),查数量不传：OVERDUE(逾期提醒)、RANK(账款评级)、FINANCE(财产线索)、RISK(风险预警)")
     private String remindType;
 
-    @ApiModelProperty(value = "筛选时间类型: ALL(全部)、MONTH(本月)、WEEK(本周) 不传默认ALL")
+    @ApiModelProperty(value = "筛选时间类型: ALL(全部)、MONTH(近30天)、WEEK(近7天) 不传默认ALL")
     private String timeSlot;
 
 

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

@@ -255,10 +255,10 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),PermissionEnum.QUERY_ALL_URGE.getCode());
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
-        if (StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.本月.getCode().equals(dto.getTimeSlot())) {
-            localDateTime = LocalDateTime.now().withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
-        }else if(StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.本周.getCode().equals(dto.getTimeSlot())){
-            localDateTime = LocalDateTime.now().with(DayOfWeek.MONDAY).withHour(0).withMinute(0).withSecond(0);
+        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);
         }
         RepalRemindCountVO result = new RepalRemindCountVO(0,0,0,0,0,0,0,0,0,0);
         if(Dict.COUNT_QUERY_ENUM.账款.getCode().equals(dto.getQueryType())){
@@ -351,10 +351,10 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         }
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
-        if (StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.本月.getCode().equals(dto.getTimeSlot())) {
-            localDateTime = LocalDateTime.now().withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
-        }else if(StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.本周.getCode().equals(dto.getTimeSlot())){
-            localDateTime = LocalDateTime.now().with(DayOfWeek.MONDAY).withHour(0).withMinute(0).withSecond(0);
+        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);
         }
         VOPage<RepalRemindHistoryVO> result = new VOPage<>(pageNum,pageSize,0L,new ArrayList<>());
         LambdaQueryWrapper<RepalRemindHistory> qw = Wrappers.lambdaQuery(RepalRemindHistory.class);

src/main/resources/mapper/RepalCustomerMapper.xml

@@ -41,5 +41,8 @@
         <if test="sortType == 5 ">
             ORDER BY totalMoney DESC
         </if>
+        <if test="sortType == 6 ">
+            ORDER BY A.ID DESC
+        </if>
     </select>
 </mapper>