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

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -291,8 +291,9 @@ public class ApiCommissionExpectedController {
     @Operation(summary = "应收款报表")
     @Operation(summary = "应收款报表")
     public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
     public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
         //保單持有人（中/英）、签单人、转介人名称（主）查询保单号列表
         //保單持有人（中/英）、签单人、转介人名称（主）查询保单号列表
-
+        List<String> queryPolicyNoList = policyFollowService.queryPolicyNoList(commissionExpectedQueryRequest.getPolicyHolder(),commissionExpectedQueryRequest.getSigner(),commissionExpectedQueryRequest.getBrokerName());
         // 构建查询条件
         // 构建查询条件
+        commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
 
 
         // 先查询所有符合条件的记录ID（用于统计）
         // 先查询所有符合条件的记录ID（用于统计）

yd-csf-service/src/main/java/com/yd/csf/service/dao/PolicyFollowMapper.java

@@ -17,7 +17,12 @@ public interface PolicyFollowMapper extends BaseMapper<PolicyFollow> {
 
 
     PolicyReportData queryPolicyReportData(@Param("policyBizId") String policyBizId);
     PolicyReportData queryPolicyReportData(@Param("policyBizId") String policyBizId);
 
 
-//    List<String> queryPolicyNoList(@Param("policyHolder") String policyHolder, @Param("signer") String signer, @Param("brokerName") String brokerName);
+    //policyHolder（中英文姓名）查询policy_policyholder表
+    //signer签单员姓名查询policy_follow
+    //brokerName转介人（主，第一个转介人，一个保单对应多个转介人，查询第一个转介人姓名即可） policy_broker
+    List<String> queryPolicyNoList(@Param("policyHolder") String policyHolder,
+                                   @Param("signer") String signer,
+                                   @Param("brokerName") String brokerName);
 }
 }
 
 
 
 

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

@@ -96,4 +96,7 @@ public class CommissionExpectedQueryRequest extends PageDto {
      * 转介人名称（主）
      * 转介人名称（主）
      */
      */
     private String brokerName;
     private String brokerName;
+
+
+    private List<String> policyNoList;
 }
 }

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

@@ -319,6 +319,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
         queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
         queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList);
         queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList);
+        queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList());
         // 范围查询
         // 范围查询
         queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);
         queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);
         queryWrapper.le(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd);
         queryWrapper.le(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd);

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

@@ -1227,8 +1227,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
 
 
     @Override
     @Override
     public List<String> queryPolicyNoList(String policyHolder, String signer, String brokerName) {
     public List<String> queryPolicyNoList(String policyHolder, String signer, String brokerName) {
-        return null;
-//        return this.baseMapper.queryPolicyNoList(policyHolder,signer,brokerName);
+        return this.baseMapper.queryPolicyNoList(policyHolder,signer,brokerName);
     }
     }
 }
 }
 
 

yd-csf-service/src/main/resources/mappers/PolicyFollowMapper.xml

@@ -131,5 +131,37 @@
         where t.policy_biz_id = #{policyBizId}
         where t.policy_biz_id = #{policyBizId}
     </select>
     </select>
 
 
+    <select id="queryPolicyNoList" resultType="java.lang.String">
+        select distinct pf.policy_no
+        from policy_follow pf
+        left join policy_policyholder pp
+        on pf.policy_biz_id = pp.policy_biz_id
+        and pp.is_deleted = 0
+        left join (
+        select pb.policy_biz_id, pb.broker_name
+        from policy_broker pb
+        inner join (
+        select policy_biz_id, min(id) as min_id
+        from policy_broker
+        where is_deleted = 0
+        group by policy_biz_id
+        ) t on pb.id = t.min_id
+        ) first_broker
+        on pf.policy_biz_id = first_broker.policy_biz_id
+        <where>
+            pf.is_deleted = 0
+            <if test="policyHolder != null and policyHolder != ''">
+                and (pp.name like concat('%', #{policyHolder}, '%')
+                or pp.name_en like concat('%', #{policyHolder}, '%'))
+            </if>
+            <if test="signer != null and signer != ''">
+                and pf.signer like concat('%', #{signer}, '%')
+            </if>
+            <if test="brokerName != null and brokerName != ''">
+                and first_broker.broker_name like concat('%', #{brokerName}, '%')
+            </if>
+        </where>
+    </select>
+
 
 
 </mapper>
 </mapper>