push

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

@@ -426,7 +426,7 @@ public class ApiCommissionExpectedController {
         commissionExpectedQueryRequest.setQueryFlag(queryFlag);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
         //显式选择需要的字段
-//        queryWrapper.select("expected_amount", "paid_amount","paid_ratio", "commission_ratio", "policy_no");
+        queryWrapper.select("expected_amount", "paid_amount","paid_ratio", "commission_ratio", "policy_no","status");
         // 先查询所有符合条件的记录ID（用于统计）
         List<CommissionExpected> allCommissionExpectedList = commissionExpectedService.list(queryWrapper);
 

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

@@ -1015,6 +1015,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         BigDecimal fromTotalPremium = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(policyNoSet)) {
             List<Policy> policyList = policyService.lambdaQuery()
+                    .select(Policy::getPolicyNo,
+                            Policy::getTotalPaymentPremium,
+                            Policy::getCurrency)
                     .in(Policy::getPolicyNo, policyNoSet)
                     .list();
             if (CollectionUtils.isNotEmpty(policyList)) {