更新

src/main/java/com/izouma/zhumj/repo/RoomMoneyWithdrawApplyRepo.java

@@ -1,8 +1,13 @@
 package com.izouma.zhumj.repo;
 
 import com.izouma.zhumj.domain.RoomMoneyWithdrawApply;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.time.LocalDateTime;
+
 public interface RoomMoneyWithdrawApplyRepo extends JpaRepository<RoomMoneyWithdrawApply, Long>, JpaSpecificationExecutor<RoomMoneyWithdrawApply> {
+    Page<RoomMoneyWithdrawApply> findAllByRoomIdAndCreatedAtBetweenOrderByCreatedAtDesc(Long roomId, LocalDateTime start, LocalDateTime end, Pageable pageable);
 }

src/main/java/com/izouma/zhumj/repo/UserMoneyWithdrawApplyRepo.java

@@ -4,11 +4,16 @@ import com.izouma.zhumj.domain.UserMoneyWithdrawApply;
 import com.izouma.zhumj.enums.PayMethod;
 import com.izouma.zhumj.enums.WithdrawApplyStatus;
 import com.izouma.zhumj.enums.WithdrawMethod;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface UserMoneyWithdrawApplyRepo extends JpaRepository<UserMoneyWithdrawApply, Long>, JpaSpecificationExecutor<UserMoneyWithdrawApply> {
     List<UserMoneyWithdrawApply> findAllByStatus(WithdrawApplyStatus status);
+
+    Page<UserMoneyWithdrawApply> findAllByUserIdAndCreatedAtBetweenOrderByCreatedAtDesc(Long userId, LocalDateTime start, LocalDateTime end, Pageable pageable);
 }

src/main/java/com/izouma/zhumj/web/RoomMoneyWithdrawApplyController.java

@@ -1,6 +1,7 @@
 package com.izouma.zhumj.web;
 
 import com.izouma.zhumj.domain.RoomMoneyWithdrawApply;
+import com.izouma.zhumj.domain.UserMoneyWithdrawApply;
 import com.izouma.zhumj.dto.PageQuery;
 import com.izouma.zhumj.dto.RoomMoneyWithdrawApplyDTO;
 import com.izouma.zhumj.exception.BusinessException;
@@ -12,11 +13,15 @@ import com.izouma.zhumj.utils.excel.ExcelUtils;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
 import java.util.List;
 
 @RestController
@@ -44,6 +49,14 @@ public class RoomMoneyWithdrawApplyController extends BaseController {
                 .findAll(toSpecification(pageQuery, RoomMoneyWithdrawApply.class), toPageRequest(pageQuery));
     }
 
+    @GetMapping("/maSearch")
+    public Page<RoomMoneyWithdrawApply> all(Long roomId, String yearMonth, Pageable pageable) {
+        LocalDateTime start = YearMonth.parse(yearMonth).atDay(1).atStartOfDay();
+        LocalDateTime end = YearMonth.parse(yearMonth).atEndOfMonth().atTime(LocalTime.MAX);
+        return roomMoneyWithdrawApplyRepo
+                .findAllByRoomIdAndCreatedAtBetweenOrderByCreatedAtDesc(roomId, start, end, pageable);
+    }
+
     @GetMapping("/allDTO")
     public Page<RoomMoneyWithdrawApplyDTO> allDTO(PageQuery pageQuery) {
         return roomMoneyWithdrawApplyService.toDTO(all(pageQuery));

src/main/java/com/izouma/zhumj/web/UserMoneyWithdrawApplyController.java

@@ -12,10 +12,14 @@ import com.izouma.zhumj.utils.excel.ExcelUtils;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
 import java.util.List;
 
 @RestController
@@ -43,6 +47,14 @@ public class UserMoneyWithdrawApplyController extends BaseController {
                 .findAll(toSpecification(pageQuery, UserMoneyWithdrawApply.class), toPageRequest(pageQuery));
     }
 
+    @GetMapping("/maSearch")
+    public Page<UserMoneyWithdrawApply> all(Long userId, String yearMonth, Pageable pageable) {
+        LocalDateTime start = YearMonth.parse(yearMonth).atDay(1).atStartOfDay();
+        LocalDateTime end = YearMonth.parse(yearMonth).atEndOfMonth().atTime(LocalTime.MAX);
+        return userMoneyWithdrawApplyRepo
+                .findAllByUserIdAndCreatedAtBetweenOrderByCreatedAtDesc(userId, start, end, pageable);
+    }
+
     @GetMapping("/get/{id}")
     public UserMoneyWithdrawApply get(@PathVariable Long id) {
         return userMoneyWithdrawApplyRepo.findById(id).orElseThrow(new BusinessException("无记录"));