Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -32,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -836,7 +837,17 @@ public class ReceivableController {
         if(StrUtil.isEmpty(settlementReportQueryVo.getSettlementEndTime()) && StrUtil.isEmpty(settlementReportQueryVo.getSettlementStartTime()) )  {
             return HttpResult.ok(receivableService.receiverSettlementReport(page,settlementReportQueryVo));
         }else{
-            // 当勾选了结算时间后，需要反着进行查询
+            if(StrUtil.isNotEmpty(settlementReportQueryVo.getSettlementStartTime())){
+                LocalDateTime localDateTime = LocalDate.parse(settlementReportQueryVo.getSettlementStartTime()).atStartOfDay();
+                settlementReportQueryVo.setSettlementStartTime(DateUtil.formatLocalDateTime(localDateTime));
+            }
+            if(StrUtil.isNotEmpty(settlementReportQueryVo.getSettlementEndTime())){
+                LocalDateTime localDateTime = LocalDate.parse(settlementReportQueryVo.getSettlementEndTime()).plusDays(1).atStartOfDay();
+                settlementReportQueryVo.setSettlementEndTime(DateUtil.formatLocalDateTime(localDateTime));
+            }
+            settlementReportQueryVo.setStartTime(null);
+            settlementReportQueryVo.setEndTime(null);
+            // 当勾选了结算时间后，需要反着进行查询, 并且将结算金额为0的数据过滤掉
             return HttpResult.ok(receivableService.receiverSettlementReportWithSettlemetnDate(page,settlementReportQueryVo));
         }
     }