Skip to content

Y
yd-csf
Commit 67f8648e by zhangxingmin
Options

push

parent 0c5d37ab
Showing with 58 additions and 14 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
...@@ -232,7 +232,7 @@ public class ApiCommissionExpectedController { ...@@ -232,7 +232,7 @@ public class ApiCommissionExpectedController {
List<Long> expectedIds = allExpectedList.stream() List<Long> expectedIds = allExpectedList.stream()
.map(CommissionExpected::getId) .map(CommissionExpected::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
CommissionExpectedStatisticsNewVO statisticsNewVO = commissionExpectedService CommissionExpectedStatisticsVO statisticsNewVO = commissionExpectedService
.getExpectedStatisticsNew(expectedIds); .getExpectedStatisticsNew(expectedIds);
// 获取混合分页结果 // 获取混合分页结果
...@@ -338,7 +338,7 @@ public class ApiCommissionExpectedController { ...@@ -338,7 +338,7 @@ public class ApiCommissionExpectedController {
List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList()); List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
// 查询统计数据（基于所有符合条件的记录） // 查询统计数据（基于所有符合条件的记录）
CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatistics(allExpectedIdList); CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allExpectedIdList);
// 应收款报表分页查询 - 按保单号和期数维度统计 // 应收款报表分页查询 - 按保单号和期数维度统计
Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize()); Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
......
yd-csf-api/src/main/java/com/yd/csf/api/dto/QueryCommissionExpectedByPageNewResponse.java
...@@ -15,7 +15,7 @@ public class QueryCommissionExpectedByPageNewResponse { ...@@ -15,7 +15,7 @@ public class QueryCommissionExpectedByPageNewResponse {
* 预计来佣统计信息 * 预计来佣统计信息
*/ */
// @Schema(description = "预计来佣统计信息") // @Schema(description = "预计来佣统计信息")
private CommissionExpectedStatisticsNewVO expectedStatisticsVO; private CommissionExpectedStatisticsVO expectedStatisticsVO;
/** /**
* 预计来佣分页列表 * 预计来佣分页列表
......
yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java
...@@ -59,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected> ...@@ -59,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds); CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds); CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds);
CommissionExpected getByBizId(String commissionExpectedBizId); CommissionExpected getByBizId(String commissionExpectedBizId);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
...@@ -909,7 +909,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -909,7 +909,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
} }
@Override @Override
public CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds) { public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds) {
// 空集合直接返回空统计 // 空集合直接返回空统计
if (CollectionUtils.isEmpty(expectedIds)) { if (CollectionUtils.isEmpty(expectedIds)) {
return emptyStatistics(); return emptyStatistics();
...@@ -968,7 +968,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -968,7 +968,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
} }
// 组装返回对象 // 组装返回对象
CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO(); CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
vo.setTotalAmount(totalAmount); vo.setTotalAmount(totalAmount);
vo.setTotalPaidAmount(totalPaidAmount); vo.setTotalPaidAmount(totalPaidAmount);
vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount)); vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount));
...@@ -995,8 +995,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -995,8 +995,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
/** /**
* 返回空的统计对象 * 返回空的统计对象
*/ */
private CommissionExpectedStatisticsNewVO emptyStatistics() { private CommissionExpectedStatisticsVO emptyStatistics() {
CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO(); CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
vo.setTotalAmount(BigDecimal.ZERO); vo.setTotalAmount(BigDecimal.ZERO);
vo.setTotalPaidAmount(BigDecimal.ZERO); vo.setTotalPaidAmount(BigDecimal.ZERO);
vo.setPendingPaidAmount(BigDecimal.ZERO); vo.setPendingPaidAmount(BigDecimal.ZERO);
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedStatisticsVO.java
...@@ -14,39 +14,83 @@ public class CommissionExpectedStatisticsVO { ...@@ -14,39 +14,83 @@ public class CommissionExpectedStatisticsVO {
/** /**
* 预计入账金额（HKD） * 预计入账金额（HKD）
*/ */
@Schema(description = "预计入账金额（HKD）") // @Schema(description = "预计入账金额（HKD）")
private BigDecimal totalAmount; private BigDecimal totalAmount;
/** /**
* 已入账金额（HKD） * 已入账金额（HKD）
*/ */
@Schema(description = "已入账金额（HKD）") // @Schema(description = "已入账金额（HKD）")
private BigDecimal totalPaidAmount; private BigDecimal totalPaidAmount;
/** /**
* 待入账金额（HKD） * 待入账金额（HKD）
*/ */
@Schema(description = "待入账金额（HKD）") // @Schema(description = "待入账金额（HKD）")
private BigDecimal pendingPaidAmount; private BigDecimal pendingPaidAmount;
/** /**
* 已入账比例 %（已入账金额/总金额） * 已入账比例 %（已入账金额/总金额）
*/ */
@Schema(description = "已入账比例 %（已入账金额/总金额）") // @Schema(description = "已入账比例 %（已入账金额/总金额）")
private BigDecimal paidAmountRatio; private BigDecimal paidAmountRatio;
/** /**
* 总保单数 * 总保单数
*/ */
@Schema(description = "总保单数") // @Schema(description = "总保单数")
private Integer totalPolicyCount; private Integer totalPolicyCount;
/** /**
* 总保费（HKD） * 总保费（HKD）
*/ */
@Schema(description = "总保费（HKD）") // @Schema(description = "总保费（HKD）")
private BigDecimal totalPremium; private BigDecimal totalPremium;
/**
* 原币种总保费
*/
private BigDecimal fromTotalPremium;
@JsonIgnore @JsonIgnore
private String policyNos; private String policyNos;
// /**
// * 预计入账金额（HKD）
// */
// @Schema(description = "预计入账金额（HKD）")
// private BigDecimal totalAmount;
//
// /**
// * 已入账金额（HKD）
// */
// @Schema(description = "已入账金额（HKD）")
// private BigDecimal totalPaidAmount;
//
// /**
// * 待入账金额（HKD）
// */
// @Schema(description = "待入账金额（HKD）")
// private BigDecimal pendingPaidAmount;
//
// /**
// * 已入账比例 %（已入账金额/总金额）
// */
// @Schema(description = "已入账比例 %（已入账金额/总金额）")
// private BigDecimal paidAmountRatio;
//
// /**
// * 总保单数
// */
// @Schema(description = "总保单数")
// private Integer totalPolicyCount;
//
// /**
// * 总保费（HKD）
// */
// @Schema(description = "总保费（HKD）")
// private BigDecimal totalPremium;
//
// @JsonIgnore
// private String policyNos;
} }
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