push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -433,6 +433,7 @@ public class ApiCommissionExpectedController {
         return receivableReportPage;
     }
     
+
     private void enrichReceivableReportWithCompanyName(IPage<ReceivableReportVO> page) {
         if (page == null || CollectionUtils.isEmpty(page.getRecords())) {
             return;

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountQueryRequest.java

@@ -26,11 +26,18 @@ public class FortuneAccountQueryRequest extends PageDto {
     @Schema(description = "出账状态, 可多选 字典值：csf_fortune_account_status")
     private List<String> statusList;
 
-    @Schema(description = "出账日期开始", format = "date")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date accountDateStart;
-
-    @Schema(description = "出账日期结束", format = "date")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date accountDateEnd;
+    //这样前端传 accountDateStart = 2026-09吗
+//    @Schema(description = "出账日期开始", format = "date")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date accountDateStart;
+//
+//    @Schema(description = "出账日期结束", format = "date")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date accountDateEnd;
+
+    @Schema(description = "出账日期开始")
+    private String accountDateStart;
+
+    @Schema(description = "出账日期结束")
+    private String accountDateEnd;
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -80,14 +80,35 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getBroker()), "broker", fortuneAccountQueryRequest.getBroker());
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getTeam()), "team", fortuneAccountQueryRequest.getTeam());
         queryWrapper.in(CollectionUtils.isNotEmpty(statusList), "status", statusList);
-        queryWrapper.ge(fortuneAccountQueryRequest.getAccountDateStart() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateStart());
-        queryWrapper.le(fortuneAccountQueryRequest.getAccountDateEnd() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateEnd());
-
+//        queryWrapper.ge(fortuneAccountQueryRequest.getAccountDateStart() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateStart());
+//        queryWrapper.le(fortuneAccountQueryRequest.getAccountDateEnd() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateEnd());
+        Date start = parseStartDate(fortuneAccountQueryRequest.getAccountDateStart());
+        Date end = parseEndDate(fortuneAccountQueryRequest.getAccountDateEnd());
+        queryWrapper.ge(start != null, "fortune_account_date", start);
+        queryWrapper.le(end != null, "fortune_account_date", end);
         // 默认排序
         queryWrapper.orderByDesc("fortune_account_date");
         return queryWrapper;
     }
 
+    private Date parseStartDate(String dateStr) {
+        if (StringUtils.isBlank(dateStr)) return null;
+        if (dateStr.length() == 7) { // yyyy-MM
+            return Date.from(YearMonth.parse(dateStr).atDay(1)
+                    .atStartOfDay(ZoneId.systemDefault()).toInstant());
+        }
+        return Date.from(LocalDate.parse(dateStr).atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+    private Date parseEndDate(String dateStr) {
+        if (StringUtils.isBlank(dateStr)) return null;
+        if (dateStr.length() == 7) { // yyyy-MM
+            return Date.from(YearMonth.parse(dateStr).atEndOfMonth()
+                    .atStartOfDay(ZoneId.systemDefault()).toInstant());
+        }
+        return Date.from(LocalDate.parse(dateStr).plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
     @Override
     public Page<FortuneAccountVO> getFortuneAccountVOPage(Page<FortuneAccount> fortunePage) {
         List<FortuneAccount> fortuneAccountList = fortunePage.getRecords();