fix:动态

src/main/java/com/winhc/repal/enums/Dict.java

@@ -116,7 +116,7 @@ public class Dict {
     }
 
     public enum TIME_SLOT_ENUM {
-        全部("ALL"),近30天("MONTH");
+        全部("ALL"),本月("MONTH"),本周("WEEK");
 
         private String code;
 

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

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel(value="智能提醒历史表入参")
 public class RepalRemindHistoryDTO {
-    @ApiModelProperty(value = "查询类型 1账款详情 2客户管理 3智能监测")
+    @ApiModelProperty(value = "查询类型 1账款详情 2客户管理 3智能监测",required = true)
     private Integer queryType;
 
     @ApiModelProperty(value = "客户ID")
@@ -26,7 +26,7 @@ public class RepalRemindHistoryDTO {
     @ApiModelProperty(value = "提醒类型(不传或者传非枚举字段默认全部),查数量不传：OVERDUE(逾期提醒)、RANK(账款评级)、FINANCE(财产线索)、RISK(风险预警)")
     private String remindType;
 
-    @ApiModelProperty(value = "筛选时间类型: ALL(全部)、MONTH(近30天) 不传默认MONTH")
+    @ApiModelProperty(value = "筛选时间类型: ALL(全部)、MONTH(本月)、WEEK(本周) 不传默认ALL")
     private String timeSlot;
 
 

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

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -247,8 +248,10 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         }
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
-        if (StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.近30天.getCode().equals(dto.getTimeSlot())) {
-            localDateTime = LocalDateTime.now().minusDays(30).withHour(0).withMinute(0).withSecond(0);
+        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);
         }
         RepalRemindCountVO result = new RepalRemindCountVO(0,0,0,0,0,0,0,0,0,0);
         if(Dict.COUNT_QUERY_ENUM.账款.getCode().equals(dto.getQueryType())){
@@ -316,8 +319,10 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         }
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
-        if (StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.近30天.getCode().equals(dto.getTimeSlot())) {
-            localDateTime = LocalDateTime.now().minusDays(30).withHour(0).withMinute(0).withSecond(0);
+        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);
         }
         VOPage<RepalRemindHistoryVO> result = new VOPage<>(pageNum,pageSize,0L,new ArrayList<>());
         LambdaQueryWrapper<RepalRemindHistory> qw = Wrappers.lambdaQuery(RepalRemindHistory.class);

src/main/resources/mapper/RepalRemindHistoryMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="com.winhc.repal.repository.RepalRemindHistoryMapper">
     <select id="getRemindUnReadVO" resultType="com.winhc.repal.model.vo.RepalBillRemindUnReadVO">
         SELECT
-            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId} AND REPAL_BILL_ID = #{repalBillId} AND TRENT_TYPE = 'RISK' AND ID > #{riskId} ) AS unreadRiskCount,
-            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND TRENT_TYPE = 'RANK' AND ID > #{rankId} ) AS unreadRankCount,
-            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND TRENT_TYPE = 'OVERDUE' AND ID > #{overdueId} ) AS unreadOverdueCount,
-            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND TRENT_TYPE = 'FINANCE' AND ID > #{financeId} ) AS unreadFinanceCount
+            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId} AND REPAL_BILL_ID = #{repalBillId} AND REMIND_TYPE = 'RISK' AND ID > #{riskId} ) AS unreadRiskCount,
+            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND REMIND_TYPE = 'RANK' AND ID > #{rankId} ) AS unreadRankCount,
+            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND REMIND_TYPE = 'OVERDUE' AND ID > #{overdueId} ) AS unreadOverdueCount,
+            ( SELECT count(*) FROM REPAL_REMIND_HISTORY WHERE REPAL_BOOK_ID = #{repalBookId}  AND REPAL_BILL_ID = #{repalBillId} AND REMIND_TYPE = 'FINANCE' AND ID > #{financeId} ) AS unreadFinanceCount
         FROM
             DUAL
     </select>