时间范围修改

src/main/java/com/winhc/repal/repository/RepalBillMapper.java

@@ -151,6 +151,6 @@ public interface RepalBillMapper extends BaseMapper<RepalBill> {
                                   @Param("userId") Long userId,
                                   @Param("repalBookId") Long repalBookId,
                                   @Param("repalBillType") Integer repalBillType,
-                                  @Param("start") LocalDateTime start,
-                                  @Param("end") LocalDateTime end);
+                                  @Param("start") LocalDate start,
+                                  @Param("end") LocalDate end);
 }

src/main/java/com/winhc/repal/service/RepalBillService.java

@@ -8,6 +8,7 @@ import com.winhc.repal.model.dto.*;
 import com.winhc.repal.model.vo.*;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -178,7 +179,7 @@ public interface RepalBillService extends IService<RepalBill> {
      * @author xda
      * @date 2022/5/9 12:21
      */
-    HomeReceivableBO getBillTotal(Integer repalBillStatus, Long userId, Long repalBookId, Integer repalBillType, LocalDateTime start, LocalDateTime end);
+    HomeReceivableBO getBillTotal(Integer repalBillStatus, Long userId, Long repalBookId, Integer repalBillType, LocalDate start, LocalDate end);
 
 
 

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

@@ -896,7 +896,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     }
 
     @Override
-    public HomeReceivableBO getBillTotal(Integer repalBillStatus, Long userId, Long repalBookId, Integer repalBillType, LocalDateTime start, LocalDateTime end) {
+    public HomeReceivableBO getBillTotal(Integer repalBillStatus, Long userId, Long repalBookId, Integer repalBillType, LocalDate start, LocalDate end) {
         return repalBillMapper.getBillTotal(repalBillStatus, userId, repalBookId, repalBillType, start, end);
     }
 

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

@@ -72,17 +72,17 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
         HomeReceivableVO vo = new HomeReceivableVO();
         boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(), PermissionEnum.QUERY_ALL_RECEIVABLE.getCode());
         // 所有
-        LocalDateTime start = null;
-        LocalDateTime end = null;
+        LocalDate start = null;
+        LocalDate end = null;
         if (Integer.valueOf(1).equals(dto.getQueryType())) {
             LocalDate now = LocalDate.now();
-            start = LocalDateTime.of(now.minusDays(7), LocalTime.MIN);
-            end = LocalDateTime.of(now, LocalTime.MAX);
+            start = now.minusDays(7);
+            end = now;
         }
         if (Integer.valueOf(2).equals(dto.getQueryType())) {
             LocalDate now = LocalDate.now();
-            start = LocalDateTime.of(now.minusDays(30), LocalTime.MIN);
-            end = LocalDateTime.of(now, LocalTime.MAX);
+            start = now.minusDays(30);
+            end = now;
         }
         HomeReceivableBO receivableBO = repalBillService.getBillTotal(null, allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), dto.getRepalBillType(), start, end);
         HomeReceivableBO overdueBO = repalBillService.getBillTotal(RepalBillStatusEnum.OVERDUE.getCode(), allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), dto.getRepalBillType(), start, end);

src/main/resources/mapper/RepalBillMapper.xml

@@ -359,10 +359,10 @@
             AND rPerson.USER_ID = #{userId}
         </if>
         <if test="start != null">
-            AND  bill.TIME_CREATED >= #{start}
+            AND  bill.END_DATE >= #{start}
         </if>
         <if test="end != null">
-            AND  bill.TIME_CREATED <![CDATA[<=]]>#{end}
+            AND  bill.END_DATE <![CDATA[<=]]>#{end}
         </if>
     </select>