fix:回款宝2回款时间入参

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 /**
  * @Description: ReturnedBillDTO
@@ -31,4 +34,15 @@ public class ReturnedBillDTO extends PageRequest {
     @ApiModelProperty("排序类型。1日期升序。2日期降序。3总金额升序。4总金额降序")
     private Integer sortedType;
 
+    @ApiModelProperty("到期时间,[1]今天, [2]本周(近7天), [3]本月(近30天), [4]本年")
+    private Integer overdueType;
+
+    @ApiModelProperty(value = "自定义开始日期yyyy-MM-dd,string")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @ApiModelProperty(value = "自定义结束日期yyyy-MM-dd,string")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDate;
+
 }

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

@@ -939,6 +939,29 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         boolean allFlag = repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode());
         dto.setUserId(allFlag ? null : userId);
         dto.setRepalGroupId(repalGroupMemberService.getUserGroupId(userId));
+        // 对应1-4到期时间
+        if (Objects.nonNull(dto.getOverdueType())) {
+            switch (dto.getOverdueType()) {
+                case 1:
+                    dto.setStartDate(LocalDate.now());
+                    dto.setEndDate(LocalDate.now());
+                    break;
+                case 2:
+                    dto.setStartDate(LocalDate.now().minusDays(7));
+                    dto.setEndDate(LocalDate.now());
+                    break;
+                case 3:
+                    dto.setStartDate(LocalDate.now().minusDays(30));
+                    dto.setEndDate(LocalDate.now());
+                    break;
+                case 4:
+                    dto.setStartDate(LocalDate.now().with(TemporalAdjusters.firstDayOfYear()));
+                    dto.setEndDate(LocalDate.now().with(TemporalAdjusters.lastDayOfYear()));
+                    break;
+                default:
+                    break;
+            }
+        }
         recordPage = repalChangeRecordMapper.getReturnedBill(recordPage, dto);
         voPage.setTotalPage(Math.toIntExact(recordPage.getPages()));
         voPage.setTotalNum(recordPage.getTotal());

src/main/resources/mapper/RepalChangeRecordMapper.xml

@@ -44,6 +44,12 @@
         <if test="param2.keyword != null and param2.keyword != ''">
             AND bill.CUSTOMER_NAME LIKE concat('%', #{param2.keyword}, '%')
         </if>
+        <if test="param2.startDate != null">
+            AND bill.END_DATE >= #{param2.startDate}
+        </if>
+        <if test="param2.endDate != null">
+            AND bill.END_DATE <![CDATA[<=]]> #{param2.endDate}
+        </if>
         <if test="param2.sortedType != null">
             <if test="param2.sortedType == 1">
                 ORDER BY recordDate, record.ID