新单跟进改版1

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

@@ -7,72 +7,84 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 查询customer请求
- *
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class PolicyFollowQueryRequest extends PageDto implements Serializable {
 
     /**
+     * 保单号
+     */
+    @Schema(description = "保单号")
+    private String policyNo;
+
+    /**
      * 新单状态
      */
     @Schema(description = "新单状态 'CHECKING'-'审核中','UNDERWRITING'-'承保中','FINISHED'-'已完成','DECLINED'-'已拒绝','CANCELLED'-'已取消', 字典值: csf_policy_follow_status")
     private String status;
 
     /**
-     * 新单编号
+     * 预约编号
      */
-    @Schema(description = "新单编号")
-    private String policyBizId;
+    @Schema(description = "预约编号")
+    private String appointmentNo;
 
     /**
-     * 保单号
+     * 签单日开始
      */
-    @Schema(description = "保单号")
-    private String policyNo;
+    @Schema(description = "签单日期开始 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate signDateStart;
 
     /**
-     * 客户名称
+     * 签单日结束
      */
-    @Schema(description = "客户名称")
-    private String customerName;
+    @Schema(description = "签单日期结束 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate signDateEnd;
 
     /**
-     * 客户编号
+     * 最晚缴费日期
      */
-    @Schema(description = "客户编号")
-    private String customerBizId;
+    @Schema(description = "最晚缴费日期 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate latestPaymentDate;
 
     /**
-     * 保险公司
+     * 投保人业务id列表
      */
-    @Schema(description = "保险公司")
-    private String insurer;
+    @Schema(description = "投保人业务id列表")
+    private List<String> policyholderBizIdList;
 
     /**
-     * 产品名称
+     * 受保人业务id列表
      */
-    @Schema(description = "产品名称")
-    private String productName;
+    @Schema(description = "受保人业务id列表")
+    private List<String> policyInsurantBizIdList;
 
     /**
-     * 签单日期开始
+     * 保险公司业务id列表
      */
-    @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 = "保险公司业务id列表")
+    private List<String> insuranceCompanyBizIdList;
 
     /**
-     * 签单日期结束
+     * 产品计划业务id列表
      */
-    @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;
+    @Schema(description = "产品计划业务id列表")
+    private List<String> productLaunchBizIdList;
 
+    /**
+     * 缴费年期
+     */
+    @Schema(description = "缴费年期")
+    private String paymentTerm;
 
     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

@@ -97,23 +97,13 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         if (policyFollowQueryRequest == null) {
             return queryWrapper;
         }
+
         String policyNo = policyFollowQueryRequest.getPolicyNo();
-        String customerName = policyFollowQueryRequest.getCustomerName();
-        String customerBizId = policyFollowQueryRequest.getCustomerBizId();
-        String status = policyFollowQueryRequest.getStatus();
-        String insurer = policyFollowQueryRequest.getInsurer();
-        String productName = policyFollowQueryRequest.getProductName();
-        Date signDateStart = policyFollowQueryRequest.getSignDateStart();
-        Date signDateEnd = policyFollowQueryRequest.getSignDateEnd();
+        String appointmentNo = policyFollowQueryRequest.getAppointmentNo();
+
 
         queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(customerName), "customer_name", customerName);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(customerBizId), "customer_biz_id", customerBizId);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(status.trim()), "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.eq(ObjectUtils.isNotEmpty(appointmentNo), "appointment_no", appointmentNo);
 
         // 排序
         queryWrapper.orderByDesc("id");