Fna接口55

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

@@ -20,7 +20,7 @@ public class CommissionQueryRequest extends PageDto implements Serializable {
     /**
      * 来佣状态
      */
-    @Schema(description = "来佣状态 '0'-'未比对','1'-'已比对', 字典值: csf_commission_status")
+    @Schema(description = "来佣状态 '1'-'已比对','2'-'部分来佣', 字典值: csf_commission_status")
     private String status;
 
     /**

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

 package com.yd.csf.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yd.common.dto.PageDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 查询customer请求
@@ -57,6 +59,20 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
     @Schema(description = "产品名称")
     private String productName;
 
+    /**
+     * 签单日期开始
+     */
+    @Schema(description = "签单日期开始", example = "2023-01-01 00:00:00",format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signDateStart;
+
+    /**
+     * 签单日期结束
+     */
+    @Schema(description = "签单日期结束", example = "2023-01-01 23:59:59",format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signDateEnd;
+
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -20,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,6 +54,8 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         String status = policyFollowQueryRequest.getStatus();
         String insurer = policyFollowQueryRequest.getInsurer();
         String productName = policyFollowQueryRequest.getProductName();
+        Date signDateStart = policyFollowQueryRequest.getSignDateStart();
+        Date signDateEnd = policyFollowQueryRequest.getSignDateEnd();
 
         queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(customerName), "customer_name", customerName);
@@ -60,6 +63,8 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
         queryWrapper.eq(ObjectUtils.isNotEmpty(insurer), "insurance", insurer);
         queryWrapper.eq(ObjectUtils.isNotEmpty(productName), "product_code", productName);
+        queryWrapper.ge(ObjectUtils.isNotEmpty(signDateStart), "sign_date", signDateStart);
+        queryWrapper.le(ObjectUtils.isNotEmpty(signDateEnd), "sign_date", signDateEnd);
 
         // 排序
         queryWrapper.orderByDesc("id");