Skip to content

Y
yd-csf
Commit 1df945a4 by zhangxingmin
Options

push

parent a3efb7ed
Showing with 116 additions and 101 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
......@@ -384,10 +384,7 @@ public class ApiCommissionExpectedController {
// 应收款报表分页查询 - 按保单号和期数维度统计
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);
}
IPage<ReceivableReportVO> receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, queryWrapper);
// enrichReceivableReportWithCompanyName(receivableReportPage);
receivableReportPage = convertReceivableReport(receivableReportPage);
// 组装返回结果
......
yd-csf-service/src/main/java/com/yd/csf/service/dao/CommissionExpectedMapper.java
package com.yd.csf.service.dao;
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.model.CommissionExpected;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -27,7 +29,7 @@ public interface CommissionExpectedMapper extends BaseMapper<CommissionExpected>
* @return 应收款报表VO分页列表
*/
IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
@Param("expectedIds") List<Long> expectedIds);
@Param(Constants.WRAPPER) QueryWrapper<CommissionExpected> wrapper);
}
......
yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java
......@@ -82,7 +82,7 @@ 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, QueryWrapper<CommissionExpected> wrapper);
void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
......@@ -1482,8 +1482,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
}
@Override
public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
return baseMapper.receivableReportPage(page, expectedIds);
public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, QueryWrapper<CommissionExpected> wrapper) {
return baseMapper.receivableReportPage(page, wrapper);
}
@Override
......
yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml
......@@ -68,98 +68,114 @@
</where>
</select>
<select id="receivableReportPage" resultType="com.yd.csf.service.vo.ReceivableReportVO">
select
null 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,
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}
</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}
</foreach>
</if>
and ce.is_deleted = 0
</where>
</select>
-- 关联保单应收单 R
SELECT
NULL AS receivableNo,
ce.policy_no AS policyNo,
COALESCE(pp.name, '') AS policyHolder,
COALESCE(pp.name_en, '') AS policyHolderEn,
COALESCE(pi.name, '') AS insured,
COALESCE(pi.name_en, '') AS insuredEn,
MAX(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,
ROW_NUMBER() OVER (PARTITION BY policy_biz_id ORDER BY id) AS rn
FROM policy_policyholder
WHERE is_deleted = 0
) pp ON p.policy_biz_id = pp.policy_biz_id AND pp.rn = 1
LEFT JOIN (
SELECT policy_biz_id, name, name_en,
ROW_NUMBER() OVER (PARTITION BY policy_biz_id ORDER BY id) AS rn
FROM policy_insurant
WHERE is_deleted = 0
) pi ON p.policy_biz_id = pi.policy_biz_id AND pi.rn = 1
WHERE ce.commission_biz_type = 'R'
AND ce.is_deleted = 0
${ew.customSqlSegment}
GROUP BY ce.policy_no, ce.commission_period
UNION ALL
-- 非关联保单应收单 U
SELECT
ce.receivable_no AS receivableNo,
ce.policy_no AS policyNo,
COALESCE(pp.name, '') AS policyHolder,
COALESCE(pp.name_en, '') AS policyHolderEn,
COALESCE(pi.name, '') AS insured,
COALESCE(pi.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,
ROW_NUMBER() OVER (PARTITION BY policy_biz_id ORDER BY id) AS rn
FROM policy_policyholder
WHERE is_deleted = 0
) pp ON p.policy_biz_id = pp.policy_biz_id AND pp.rn = 1
LEFT JOIN (
SELECT policy_biz_id, name, name_en,
ROW_NUMBER() OVER (PARTITION BY policy_biz_id ORDER BY id) AS rn
FROM policy_insurant
WHERE is_deleted = 0
) pi ON p.policy_biz_id = pi.policy_biz_id AND pi.rn = 1
WHERE ce.commission_biz_type = 'U'
AND ce.is_deleted = 0
${ew.customSqlSegment}
</select>
</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