Skip to content

Y
yd-csf
Commit c4db7e50 by zhangxingmin
Options

push

parent f62da5ab
Showing with 237 additions and 130 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
......@@ -351,52 +351,88 @@ public class ApiCommissionExpectedController {
* @param commissionExpectedQueryRequest
* @return
*/
// @PostMapping("/receivable_report")
// @Operation(summary = "应收款报表")
// public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
// //保單持有人（中/英、繁简/大小写）、签单人、转介人名称（主）、受保人（中/英、繁简/大小写）、查询保单号列表
// List<String> queryPolicyNoList = new ArrayList<>();
// Boolean queryFlag = false;
// if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder())
// || StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner())
// || StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName())
// || StringUtils.isNotBlank(commissionExpectedQueryRequest.getInsured())
// ){
// queryPolicyNoList = policyFollowService.queryPolicyNoList(
// commissionExpectedQueryRequest.getPolicyHolder(),
// commissionExpectedQueryRequest.getSigner(),
// commissionExpectedQueryRequest.getBrokerName(),
// commissionExpectedQueryRequest.getInsured());
// queryFlag = true;
// }
// log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList));
// // 构建查询条件
// commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
// commissionExpectedQueryRequest.setQueryFlag(queryFlag);
// QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
//
//// List<Long> allExpectedIdList = new ArrayList<>();
// // 先查询所有符合条件的记录ID（用于统计）
//// List<CommissionExpected> allCommissionExpectedList = commissionExpectedService.list(queryWrapper);
//// List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
//
// // 查询统计数据（基于所有符合条件的记录）
//// CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allCommissionExpectedList);
//
// queryWrapper.select("id");
// List<Long> allExpectedIdList = commissionExpectedService.listObjs(queryWrapper, obj -> (Long) obj);
//
// // 应收款报表分页查询 - 按保单号和期数维度统计
// Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
// IPage<ReceivableReportVO> receivableReportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
// if (!CollectionUtils.isEmpty(allExpectedIdList)) {
// receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
// }
//// enrichReceivableReportWithCompanyName(receivableReportPage);
// receivableReportPage = convertReceivableReport(receivableReportPage);
// // 组装返回结果
// ReceivableReportResponse response = new ReceivableReportResponse();
//// response.setStatisticsVO(statisticsVO);
// response.setPage(receivableReportPage);
// return Result.success(response);
// }
@PostMapping("/receivable_report")
@Operation(summary = "应收款报表")
public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
//保單持有人（中/英、繁简/大小写）、签单人、转介人名称（主）、受保人（中/英、繁简/大小写）、查询保单号列表
public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest request) {
// 1. 根据持有人、签单人等条件查询保单号列表
List<String> queryPolicyNoList = new ArrayList<>();
Boolean queryFlag = false;
if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder())
|| StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner())
|| StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName())
|| StringUtils.isNotBlank(commissionExpectedQueryRequest.getInsured())
){
if (StringUtils.isNotBlank(request.getPolicyHolder())
|| StringUtils.isNotBlank(request.getSigner())
|| StringUtils.isNotBlank(request.getBrokerName())
|| StringUtils.isNotBlank(request.getInsured())) {
queryPolicyNoList = policyFollowService.queryPolicyNoList(
commissionExpectedQueryRequest.getPolicyHolder(),
commissionExpectedQueryRequest.getSigner(),
commissionExpectedQueryRequest.getBrokerName(),
commissionExpectedQueryRequest.getInsured());
request.getPolicyHolder(),
request.getSigner(),
request.getBrokerName(),
request.getInsured());
queryFlag = true;
}
log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList));
// 构建查询条件
commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
commissionExpectedQueryRequest.setQueryFlag(queryFlag);
QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
// List<Long> allExpectedIdList = new ArrayList<>();
// 先查询所有符合条件的记录ID（用于统计）
// List<CommissionExpected> allCommissionExpectedList = commissionExpectedService.list(queryWrapper);
// List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}", JSON.toJSONString(queryPolicyNoList));
// 查询统计数据（基于所有符合条件的记录）
// CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allCommissionExpectedList);
// 2. 将保单号列表设回请求对象
request.setPolicyNoList(queryPolicyNoList);
request.setQueryFlag(queryFlag);
queryWrapper.select("id");
List<Long> allExpectedIdList = commissionExpectedService.listObjs(queryWrapper, obj -> (Long) obj);
// 3. 直接分页查询（无需先查 ID）
Page<ReceivableReportVO> page = new Page<>(request.getPageNo(), request.getPageSize());
IPage<ReceivableReportVO> receivableReportPage = commissionExpectedService.receivableReportPage(page, request);
// 应收款报表分页查询 - 按保单号和期数维度统计
Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
IPage<ReceivableReportVO> receivableReportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
if (!CollectionUtils.isEmpty(allExpectedIdList)) {
receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
}
// enrichReceivableReportWithCompanyName(receivableReportPage);
// 4. 后处理：补充产品名称等字段，以及待入账金额归零逻辑
receivableReportPage = convertReceivableReport(receivableReportPage);
// 组装返回结果
// 5. 组装返回（统计信息暂不提供，如需可后续添加单独统计查询）
ReceivableReportResponse response = new ReceivableReportResponse();
// response.setStatisticsVO(statisticsVO);
response.setPage(receivableReportPage);
return Result.success(response);
}
......
yd-csf-service/src/main/java/com/yd/csf/service/dao/CommissionExpectedMapper.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
import com.yd.csf.service.model.CommissionExpected;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
......@@ -28,8 +29,11 @@ public interface CommissionExpectedMapper extends BaseMapper<CommissionExpected>
* @param expectedIds 预计来佣ID列表
* @return 应收款报表VO分页列表
*/
IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
@Param("expectedIds") List<Long> expectedIds);
// IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
// @Param("expectedIds") List<Long> expectedIds);
IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
@Param("query") CommissionExpectedQueryRequest query);
}
......
yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java
......@@ -82,9 +82,12 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
* @param expectedIds 预计来佣ID列表
* @return 应收款报表VO分页列表
*/
IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds);
// IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds);
void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
CommissionExpectedQueryRequest query);
void testExpectedCommission(String policyNo, String effectiveDate, String coolingOffEndDate) throws IOException;
Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
......@@ -1481,10 +1481,16 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
return cal.getTime();
}
// @Override
// public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
// return baseMapper.receivableReportPage(page, expectedIds);
// }
@Override
public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
return baseMapper.receivableReportPage(page, expectedIds);
}
public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
CommissionExpectedQueryRequest query){
return baseMapper.receivableReportPage(page, query);
};
@Override
public void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException {
......
yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml
......@@ -69,98 +69,156 @@
</select>
<select id="receivableReportPage" resultType="com.yd.csf.service.vo.ReceivableReportVO">
select
null as receivableNo,
ce.policy_no as policyNo,
'' as policyHolder,
(select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
(select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
(select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
ce.manual_remark as manualRemark,
MAX(ce.reconciliation_company) as reconciliationCompany,
MAX(ce.reconciliation_company_biz_id) as reconciliationCompanyBizId,
ce.commission_period as commissionPeriod,
MAX(ce.total_period) as totalPeriod,
MAX(ce.commission_date) as commissionDate,
ifnull(sum(ce.commission_ratio), 0) as commissionRatio,
ifnull(sum(ce.paid_ratio), 0) as paid,
ifnull(sum(ce.amount), 0) as amount,
MAX(ce.currency) as currency,
ifnull(sum(ce.expected_amount), 0) as hkdAmount,
ifnull(sum(ce.paid_amount), 0) as paidAmount,
ifnull(sum(ce.expected_amount) - sum(ce.paid_amount), 0) as unpaidAmount,
case when ifnull(sum(ce.expected_amount), 0) > 0
then round(ifnull(sum(ce.paid_amount), 0) / ifnull(sum(ce.expected_amount), 0) * 100, 2)
else 0
end as paidRatio,
case when ifnull(sum(ce.expected_amount), 0) > 0
then round((ifnull(sum(ce.expected_amount), 0) - ifnull(sum(ce.paid_amount), 0)) / ifnull(sum(ce.expected_amount), 0) * 100, 2)
else 0
end as unpaidRatio,
MAX(ce.default_exchange_rate) as exchangeRate,
MAX(p.insurance_company) as insuranceCompany,
MAX(p.product_name) as productName,
ifnull(avg(ce.premium), 0) as premium,
MAX(p.currency) as policyCurrency
from commission_expected ce
left join policy p on ce.policy_no = p.policy_no
<where>
ce.commission_biz_type = 'R'
<if test="expectedIds != null and expectedIds.size > 0">
and ce.id in
<foreach collection="expectedIds" item="item" open="(" close=")" separator=",">
#{item}
<!-- 预先获取每个 policy_biz_id 对应的第一条保单持有人和受保人信息 -->
<!-- 使用子查询 + MIN(id) 方式，兼容 MySQL 5.7 -->
SELECT
tmp.*
FROM (
-- 关联保单应收单部分
SELECT
NULL AS receivableNo,
ce.policy_no AS policyNo,
ph.name AS policyHolder,
ph.name_en AS policyHolderEn,
ins.name AS insured,
ins.name_en AS insuredEn,
ce.manual_remark AS manualRemark,
MAX(ce.reconciliation_company) AS reconciliationCompany,
MAX(ce.reconciliation_company_biz_id) AS reconciliationCompanyBizId,
ce.commission_period AS commissionPeriod,
MAX(ce.total_period) AS totalPeriod,
MAX(ce.commission_date) AS commissionDate,
IFNULL(SUM(ce.commission_ratio), 0) AS commissionRatio,
IFNULL(SUM(ce.paid_ratio), 0) AS paid,
IFNULL(SUM(ce.amount), 0) AS amount,
MAX(ce.currency) AS currency,
IFNULL(SUM(ce.expected_amount), 0) AS hkdAmount,
IFNULL(SUM(ce.paid_amount), 0) AS paidAmount,
IFNULL(SUM(ce.expected_amount) - SUM(ce.paid_amount), 0) AS unpaidAmount,
CASE WHEN IFNULL(SUM(ce.expected_amount), 0) > 0
THEN ROUND(IFNULL(SUM(ce.paid_amount), 0) / IFNULL(SUM(ce.expected_amount), 0) * 100, 2)
ELSE 0
END AS paidRatio,
CASE WHEN IFNULL(SUM(ce.expected_amount), 0) > 0
THEN ROUND((IFNULL(SUM(ce.expected_amount), 0) - IFNULL(SUM(ce.paid_amount), 0)) / IFNULL(SUM(ce.expected_amount), 0) * 100, 2)
ELSE 0
END AS unpaidRatio,
MAX(ce.default_exchange_rate) AS exchangeRate,
MAX(p.insurance_company) AS insuranceCompany,
MAX(p.product_name) AS productName,
IFNULL(AVG(ce.premium), 0) AS premium,
MAX(p.currency) AS policyCurrency
FROM commission_expected ce
LEFT JOIN policy p ON ce.policy_no = p.policy_no
LEFT JOIN (
SELECT policy_biz_id, name, name_en
FROM policy_policyholder
WHERE id IN (SELECT MIN(id) FROM policy_policyholder GROUP BY policy_biz_id)
) ph ON ph.policy_biz_id = p.policy_biz_id
LEFT JOIN (
SELECT policy_biz_id, name, name_en
FROM policy_insurant
WHERE id IN (SELECT MIN(id) FROM policy_insurant GROUP BY policy_biz_id)
) ins ON ins.policy_biz_id = p.policy_biz_id
WHERE ce.commission_biz_type = 'R'
AND ce.is_deleted = 0
<include refid="receivableReportWhere"/>
GROUP BY ce.policy_no, ce.commission_period
UNION ALL
-- 非关联保单应收单部分
SELECT
ce.receivable_no AS receivableNo,
ce.policy_no AS policyNo,
ph.name AS policyHolder,
ph.name_en AS policyHolderEn,
ins.name AS insured,
ins.name_en AS insuredEn,
ce.manual_remark AS manualRemark,
ce.reconciliation_company AS reconciliationCompany,
ce.reconciliation_company_biz_id AS reconciliationCompanyBizId,
ce.commission_period AS commissionPeriod,
ce.total_period AS totalPeriod,
ce.commission_date AS commissionDate,
NULL AS commissionRatio,
NULL AS paid,
IFNULL(ce.amount, 0) AS amount,
ce.currency AS currency,
IFNULL(ce.expected_amount, 0) AS hkdAmount,
IFNULL(ce.paid_amount, 0) AS paidAmount,
IFNULL(ce.expected_amount - ce.paid_amount, 0) AS unpaidAmount,
CASE WHEN IFNULL(ce.expected_amount, 0) > 0
THEN ROUND(IFNULL(ce.paid_amount, 0) / IFNULL(ce.expected_amount, 0) * 100, 2)
ELSE 0
END AS paidRatio,
CASE WHEN IFNULL(ce.expected_amount, 0) > 0
THEN ROUND((IFNULL(ce.expected_amount, 0) - IFNULL(ce.paid_amount, 0)) / IFNULL(ce.expected_amount, 0) * 100, 2)
ELSE 0
END AS unpaidRatio,
ce.default_exchange_rate AS exchangeRate,
p.insurance_company AS insuranceCompany,
p.product_name AS productName,
IFNULL(ce.premium, 0) AS premium,
NULL AS policyCurrency
FROM commission_expected ce
LEFT JOIN policy p ON ce.policy_no = p.policy_no
LEFT JOIN (
SELECT policy_biz_id, name, name_en
FROM policy_policyholder
WHERE id IN (SELECT MIN(id) FROM policy_policyholder GROUP BY policy_biz_id)
) ph ON ph.policy_biz_id = p.policy_biz_id
LEFT JOIN (
SELECT policy_biz_id, name, name_en
FROM policy_insurant
WHERE id IN (SELECT MIN(id) FROM policy_insurant GROUP BY policy_biz_id)
) ins ON ins.policy_biz_id = p.policy_biz_id
WHERE ce.commission_biz_type = 'U'
AND ce.is_deleted = 0
<include refid="receivableReportWhere"/>
) tmp
ORDER BY tmp.commissionDate DESC, tmp.policyNo, tmp.commissionPeriod
</select>
<!-- 公共 WHERE 条件片段 -->
<sql id="receivableReportWhere">
<if test="query.policyNo != null and query.policyNo != ''">
AND ce.policy_no = #{query.policyNo}
</if>
<if test="query.policyNoList != null and query.policyNoList.size > 0">
AND ce.policy_no IN
<foreach collection="query.policyNoList" item="no" open="(" close=")" separator=",">
#{no}
</foreach>
</if>
and ce.is_deleted = 0
</where>
group by ce.policy_no, ce.commission_period
union all
select
ce.receivable_no as receivableNo,
ce.policy_no as policyNo,
(select pp.name from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolder,
(select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
(select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
(select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
ce.manual_remark as manualRemark,
ce.reconciliation_company as reconciliationCompany,
ce.reconciliation_company_biz_id as reconciliationCompanyBizId,
ce.commission_period as commissionPeriod,
ce.total_period as totalPeriod,
ce.commission_date as commissionDate,
null as commissionRatio,
null as paid,
ifnull(ce.amount, 0) as amount,
ce.currency as currency,
ifnull(ce.expected_amount, 0) as hkdAmount,
ifnull(ce.paid_amount, 0) as paidAmount,
ifnull(ce.expected_amount - ce.paid_amount, 0) as unpaidAmount,
case when ifnull(ce.expected_amount, 0) > 0
then round(ifnull(ce.paid_amount, 0) / ifnull(ce.expected_amount, 0) * 100, 2)
else 0
end as paidRatio,
case when ifnull(ce.expected_amount, 0) > 0
then round((ifnull(ce.expected_amount, 0) - ifnull(ce.paid_amount, 0)) / ifnull(ce.expected_amount, 0) * 100, 2)
else 0
end as unpaidRatio,
ce.default_exchange_rate as exchangeRate,
p.insurance_company as insuranceCompany,
p.product_name as productName,
ifnull(ce.premium, 0) as premium,
null as policyCurrency
from commission_expected ce
left join policy p on ce.policy_no = p.policy_no
<where>
ce.commission_biz_type = 'U'
<if test="expectedIds != null and expectedIds.size > 0">
and ce.id in
<foreach collection="expectedIds" item="item" open="(" close=")" separator=",">
#{item}
<if test="query.commissionDateStart != null">
AND ce.commission_date >= #{query.commissionDateStart}
</if>
<if test="query.commissionDateEnd != null">
AND ce.commission_date &lt;= #{query.commissionDateEnd}
</if>
<if test="query.commissionPeriod != null">
AND ce.commission_period = #{query.commissionPeriod}
</if>
<if test="query.commissionType != null and query.commissionType != ''">
AND ce.commission_type = #{query.commissionType}
</if>
<if test="query.reconciliationCompanyBizIdList != null and query.reconciliationCompanyBizIdList.size > 0">
AND ce.reconciliation_company_biz_id IN
<foreach collection="query.reconciliationCompanyBizIdList" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
and ce.is_deleted = 0
</where>
</select>
<if test="query.insurerCompanyBizIdList != null and query.insurerCompanyBizIdList.size > 0">
AND ce.insurance_company_biz_id IN
<foreach collection="query.insurerCompanyBizIdList" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
<if test="query.productLaunchBizId != null and query.productLaunchBizId != ''">
AND ce.product_launch_biz_id = #{query.productLaunchBizId}
</if>
<!-- 可根据需要添加更多条件，如 statusList 等 -->
</sql>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment