新单跟进132

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

@@ -114,10 +114,6 @@ public class ApiCommissionExpectedController {
         long current = CommissionExpectedQueryRequest.getPageNo();
         long current = CommissionExpectedQueryRequest.getPageNo();
         long size = CommissionExpectedQueryRequest.getPageSize();
         long size = CommissionExpectedQueryRequest.getPageSize();
 
 
-        if (StringUtils.isBlank(CommissionExpectedQueryRequest.getPolicyNo())) {
-            return Result.success(new Page<>(current, size));
-        }
-
         // 查询数据库
         // 查询数据库
         Page<CommissionExpected> CommissionExpectedPage = CommissionExpectedService.page(new Page<>(current, size),
         Page<CommissionExpected> CommissionExpectedPage = CommissionExpectedService.page(new Page<>(current, size),
                 CommissionExpectedService.getQueryWrapper(CommissionExpectedQueryRequest));
                 CommissionExpectedService.getQueryWrapper(CommissionExpectedQueryRequest));

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

@@ -15,8 +15,10 @@ import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.Policy;
+import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.dao.CommissionExpectedMapper;
 import com.yd.csf.service.dao.CommissionExpectedMapper;
+import com.yd.csf.service.service.PolicyFollowService;
 import com.yd.csf.service.service.PolicyService;
 import com.yd.csf.service.service.PolicyService;
 import com.yd.csf.service.vo.CommissionExpectedVO;
 import com.yd.csf.service.vo.CommissionExpectedVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -44,6 +46,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     @Resource
     @Resource
     private PolicyService policyService;
     private PolicyService policyService;
 
 
+    @Resource
+    private PolicyFollowService policyFollowService;
+
+
     @Override
     @Override
     public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) {
     public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) {
         List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords();
         List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords();
@@ -52,8 +58,23 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             return CommissionExpectedVOPage;
             return CommissionExpectedVOPage;
         }
         }
 
 
+        // 关联查询保单信息
+        Set<String> policyNoSet = CommissionExpectedList.stream().map(CommissionExpected::getPolicyNo).collect(Collectors.toSet());
+        QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<PolicyFollow>();
+        queryWrapper.select("policy_no", "payment_premium");
+        queryWrapper.in("policy_no", policyNoSet);
+        Map<String, PolicyFollow> policyMap = policyFollowService.list(queryWrapper)
+                .stream().collect(Collectors.toMap(PolicyFollow::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
+
         // 填充信息
         // 填充信息
-        List<CommissionExpectedVO> CommissionExpectedVOList = CommissionExpectedList.stream().map(CommissionExpectedVO::objToVo).collect(Collectors.toList());
+        List<CommissionExpectedVO> CommissionExpectedVOList = CommissionExpectedList.stream().map(commissionExpected -> {
+            CommissionExpectedVO commissionExpectedVO = CommissionExpectedVO.objToVo(commissionExpected);
+            PolicyFollow policyFollow = policyMap.get(commissionExpected.getPolicyNo());
+            if (policyFollow != null) {
+                commissionExpectedVO.setPremium(policyFollow.getPaymentPremium());
+            }
+            return commissionExpectedVO;
+        }).collect(Collectors.toList());
         CommissionExpectedVOPage.setRecords(CommissionExpectedVOList);
         CommissionExpectedVOPage.setRecords(CommissionExpectedVOList);
         return CommissionExpectedVOPage;
         return CommissionExpectedVOPage;
     }
     }

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

@@ -33,6 +33,12 @@ public class CommissionExpectedVO implements Serializable {
     private String policyNo;
     private String policyNo;
 
 
     /**
     /**
+     * 保费
+     */
+    @Schema(description = "保费")
+    private Object premium;
+
+    /**
      * 对账公司
      * 对账公司
      */
      */
     @Schema(description = "对账公司")
     @Schema(description = "对账公司")