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

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

@@ -53,8 +53,7 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
      * 最晚缴费日期
      * 最晚缴费日期
      */
      */
     @Schema(description = "最晚缴费日期 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
     @Schema(description = "最晚缴费日期 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date latestPaymentDate;
+    private String latestPaymentDate;
 
 
     /**
     /**
      * 投保人业务id列表
      * 投保人业务id列表
@@ -84,7 +83,7 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
      * 缴费年期
      * 缴费年期
      */
      */
     @Schema(description = "缴费年期")
     @Schema(description = "缴费年期")
-    private String issueNumber;
+    private Integer issueNumber;
 
 
     private static final long serialVersionUID = 1L;
     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

@@ -113,17 +113,17 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         String appointmentNo = policyFollowQueryRequest.getAppointmentNo();
         String appointmentNo = policyFollowQueryRequest.getAppointmentNo();
         Date signDateStart = policyFollowQueryRequest.getSignDateStart();
         Date signDateStart = policyFollowQueryRequest.getSignDateStart();
         Date signDateEnd = policyFollowQueryRequest.getSignDateEnd();
         Date signDateEnd = policyFollowQueryRequest.getSignDateEnd();
-        Date latestPaymentDate = policyFollowQueryRequest.getLatestPaymentDate();
+        String latestPaymentDate = policyFollowQueryRequest.getLatestPaymentDate();
         List<String> insuranceCompanyBizIdList = policyFollowQueryRequest.getInsuranceCompanyBizIdList();
         List<String> insuranceCompanyBizIdList = policyFollowQueryRequest.getInsuranceCompanyBizIdList();
         List<String> productLaunchBizIdList = policyFollowQueryRequest.getProductLaunchBizIdList();
         List<String> productLaunchBizIdList = policyFollowQueryRequest.getProductLaunchBizIdList();
-        String issueNumber = policyFollowQueryRequest.getIssueNumber();
+        Integer issueNumber = policyFollowQueryRequest.getIssueNumber();
 
 
         queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
         queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
         queryWrapper.eq(ObjectUtils.isNotEmpty(appointmentNo), "appointment_no", appointmentNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(appointmentNo), "appointment_no", appointmentNo);
         queryWrapper.ge(ObjectUtils.isNotEmpty(signDateStart), "sign_date", signDateStart);
         queryWrapper.ge(ObjectUtils.isNotEmpty(signDateStart), "sign_date", signDateStart);
         queryWrapper.le(ObjectUtils.isNotEmpty(signDateEnd), "sign_date", signDateEnd);
         queryWrapper.le(ObjectUtils.isNotEmpty(signDateEnd), "sign_date", signDateEnd);
-        queryWrapper.ge(ObjectUtils.isNotEmpty(latestPaymentDate), "latest_payment_date", latestPaymentDate);
+        queryWrapper.eq(ObjectUtils.isNotEmpty(latestPaymentDate), "latest_payment_date", latestPaymentDate);
 
 
         if (CollectionUtils.isNotEmpty(insuranceCompanyBizIdList)) {
         if (CollectionUtils.isNotEmpty(insuranceCompanyBizIdList)) {
             queryWrapper.in("insurance_company_biz_id", insuranceCompanyBizIdList);
             queryWrapper.in("insurance_company_biz_id", insuranceCompanyBizIdList);