push

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

@@ -81,4 +81,19 @@ public class CommissionExpectedQueryRequest extends PageDto {
      */
     @Schema(description = "转介人所属团队业务ID")
     private String teamBizId;
+
+    /**
+     * 保單持有人（中/英）
+     */
+    private String policyHolder;
+
+    /**
+     * 签单人
+     */
+    private String signer;
+
+    /**
+     * 转介人名称（主）
+     */
+    private String brokerName;
 }

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

@@ -129,12 +129,13 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         queryWrapper.le(ObjectUtils.isNotEmpty(signDateEnd), "sign_date", signDateEnd);
         queryWrapper.eq(ObjectUtils.isNotEmpty(latestPaymentDate), "latest_payment_date", latestPaymentDate);
         //保單持有人（投保人）
-        queryWrapper.like(StringUtils.isNotEmpty(policyFollowQueryRequest.getPolicyHolder()), "policy_holder", policyFollowQueryRequest.getPolicyHolder());
+        if (StringUtils.isNotEmpty(policyFollowQueryRequest.getPolicyHolder())) queryWrapper.like( "policy_holder", policyFollowQueryRequest.getPolicyHolder());
         //受保人
-        queryWrapper.like(StringUtils.isNotEmpty(policyFollowQueryRequest.getInsured()), "insured", policyFollowQueryRequest.getInsured());
+        if (StringUtils.isNotEmpty(policyFollowQueryRequest.getInsured())) queryWrapper.like("insured", policyFollowQueryRequest.getInsured());
         //签单人
-        queryWrapper.like(StringUtils.isNotEmpty(policyFollowQueryRequest.getSigner()), "signer", policyFollowQueryRequest.getSigner());
+        if (StringUtils.isNotEmpty(policyFollowQueryRequest.getSigner())) queryWrapper.like("signer", policyFollowQueryRequest.getSigner());
         //转介人（保单转介人表）
+        if (StringUtils.isNotEmpty(policyFollowQueryRequest.getBrokerName())) {
             List<PolicyBroker> policyBrokerList = policyBrokerService.queryList(QueryPolicyBrokerDto.builder().brokerName(policyFollowQueryRequest.getBrokerName()).build());
             if (!CollectionUtils.isEmpty(policyBrokerList)) {
                 //新单跟进唯一业务ID
@@ -143,6 +144,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                     queryWrapper.in("policy_biz_id", policyBizIdList);
                 }
             }
+        }
 
         if (CollectionUtils.isNotEmpty(insuranceCompanyBizIdList)) {
             queryWrapper.in("insurance_company_biz_id", insuranceCompanyBizIdList);

yd-csf-service/src/main/java/com/yd/csf/service/vo/PolicyFollowVO.java

@@ -171,6 +171,7 @@ public class PolicyFollowVO implements Serializable {
     /**
      * 冷静期结束日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date coolingOffEndDate;
 
     /**