Merge branch 'dev_jzg_lipf_v20260622'

commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -53,6 +53,9 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "签单时间结束时间")
     private String signingTimeEnd;
 
+    @Schema(description = "签单时间")
+    private String[] signingTime;
+
     @Schema(description = "订单号")
     private String orderNo;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/DateUtil.java

@@ -18,7 +18,7 @@ import java.util.Locale;
  *
  * @author MrBird
  */
-public class DateUtil {
+public class DateUtil extends cn.hutool.core.date.DateUtil {
 
     /**
      * log日志
@@ -33,6 +33,7 @@ public class DateUtil {
 
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
+
     /**
      * 格式化时间，格式为 yyyyMMddHHmmss
      *
@@ -43,6 +44,10 @@ public class DateUtil {
         return formatFullTime(localDateTime, FULL_TIME_PATTERN);
     }
 
+    public static String fmtStd(LocalDateTime localDateTime) {
+        return formatFullTime(localDateTime, FULL_TIME_SPLIT_PATTERN);
+    }
+
     /**
      * 根据传入的格式，格式化时间
      *

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

@@ -1,6 +1,7 @@
 package com.jzg.organization.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -29,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -474,6 +477,14 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("1");
         }
+        if(StrUtil.isEmpty(receivableQueryVo.getSigningTimeStart()) &&
+                StrUtil.isEmpty(receivableQueryVo.getSigningTimeEnd()) &&
+                receivableQueryVo.getSigningTime() != null &&
+                receivableQueryVo.getSigningTime().length == 2){
+            receivableQueryVo.setSigningTimeStart(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[0], DateTimeFormatter.ISO_DATE).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
+            receivableQueryVo.setSigningTimeEnd(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[0], DateTimeFormatter.ISO_DATE).plusDays(1).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         receivableQueryVo.setSystemCode(baseController.getSystemCode());
         Page<InsPlyIncome> data = receivableService.getPlatFormReceivableList(receivableQueryVo);
         InsPlyIncomeVO vo = receivableService.getReceivablePageIds(receivableQueryVo);