|
|
@@ -513,6 +513,23 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
if (invSettlementSourceQueryVo.getInsuredName() != null && !"".equals(invSettlementSourceQueryVo.getInsuredName())) {
|
|
|
queryWrapper.like(InvSettlementSource::getInsuredName, invSettlementSourceQueryVo.getInsuredName());
|
|
|
}
|
|
|
+
|
|
|
+ if (invSettlementSourceQueryVo.getJqPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getJqPolicyId())) {
|
|
|
+ List<String> newsTypes = Arrays.asList(invSettlementSourceQueryVo.getJqPolicyId().split(","));
|
|
|
+ queryWrapper.in(InvSettlementSource::getJqPolicyId, newsTypes);
|
|
|
+ }
|
|
|
+ if (invSettlementSourceQueryVo.getSyPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getSyPolicyId())) {
|
|
|
+ List<String> newsTypes = Arrays.asList(invSettlementSourceQueryVo.getSyPolicyId().split(","));
|
|
|
+ queryWrapper.in(InvSettlementSource::getSyPolicyId, newsTypes);
|
|
|
+ }
|
|
|
+ if (invSettlementSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getNonCarPolicyId())) {
|
|
|
+ List<String> newsTypes = Arrays.asList(invSettlementSourceQueryVo.getNonCarPolicyId().split(","));
|
|
|
+ queryWrapper.in(InvSettlementSource::getNonCarPolicyId, newsTypes);
|
|
|
+ }
|
|
|
+ if (invSettlementSourceQueryVo.getLicenseno() != null && !"".equals(invSettlementSourceQueryVo.getLicenseno())) {
|
|
|
+ List<String> newsTypes = Arrays.asList(invSettlementSourceQueryVo.getLicenseno().split(","));
|
|
|
+ queryWrapper.in(InvSettlementSource::getLicenseno, newsTypes);
|
|
|
+ }
|
|
|
Page pageData = invSettlementSourceMapper.selectPage(page, queryWrapper);
|
|
|
|
|
|
return pageData;
|
|
|
@@ -680,13 +697,12 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
.add(invSource.getNonCarPremium().multiply(invSource.getNonCarNonCopyingRatio()))));
|
|
|
|
|
|
|
|
|
-
|
|
|
//选择类型为平台类型时 应收金额 = 含税保费 * 应收比例
|
|
|
if (invSource.getInvSourceType().equals("platform")) {
|
|
|
//处理应收金额
|
|
|
invSource.setReceivable(invSource.getJqPremiumTax().multiply(invSource.getJqReceivableRatio())
|
|
|
.add(invSource.getSyPremiumTax().multiply(invSource.getSyReceivableRatio())
|
|
|
- .add(invSource.getNonCarPremiumTax().multiply(invSource.getNonCarReceivableRatio()))));
|
|
|
+ .add(invSource.getNonCarPremiumTax().multiply(invSource.getNonCarReceivableRatio()))));
|
|
|
//处理应收总金额
|
|
|
invSource.setTotalReceivableAmount(
|
|
|
invSource.getReceivable().add(invSource.getSubsidyAmount()));
|
|
|
@@ -719,7 +735,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
invSettlementSource.setSettlementAmount(
|
|
|
invSettlementSource.getJqPremiumTax().multiply(invSettlementSource.getCompulsoryExportRatio())
|
|
|
.add(invSettlementSource.getSyPremiumTax().multiply(invSettlementSource.getCommercialExportRatio())
|
|
|
- .add(invSettlementSource.getNonCarPremiumTax().multiply(invSettlementSource.getNonVehicleExportRatio())))
|
|
|
+ .add(invSettlementSource.getNonCarPremiumTax().multiply(invSettlementSource.getNonVehicleExportRatio())))
|
|
|
);
|
|
|
DateTime dateTime = new DateTime();
|
|
|
invSettlementSource.setRevenueTime(dateTime.toString());
|