|
@@ -4065,7 +4065,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
for (int month = 1; month <= 12; month++) {
|
|
for (int month = 1; month <= 12; month++) {
|
|
|
InsFeeFollowOrderVo vo = buildFollowOrderVo(
|
|
InsFeeFollowOrderVo vo = buildFollowOrderVo(
|
|
|
year, month, firstItem, partnerCompanyId,
|
|
year, month, firstItem, partnerCompanyId,
|
|
|
- monthReceivableMap, invoicedMap
|
|
|
|
|
|
|
+ monthReceivableMap, invoicedMap, followInvoicePageListVo
|
|
|
);
|
|
);
|
|
|
result.add(vo);
|
|
result.add(vo);
|
|
|
}
|
|
}
|
|
@@ -4195,7 +4195,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
private InsFeeFollowOrderVo buildFollowOrderVo(Integer year, int month, InsPlyIncomeDto firstItem,
|
|
private InsFeeFollowOrderVo buildFollowOrderVo(Integer year, int month, InsPlyIncomeDto firstItem,
|
|
|
String partnerCompanyId,
|
|
String partnerCompanyId,
|
|
|
Map<Integer, BigDecimal> monthReceivableMap,
|
|
Map<Integer, BigDecimal> monthReceivableMap,
|
|
|
- Map<String, BigDecimal> invoicedMap) {
|
|
|
|
|
|
|
+ Map<String, BigDecimal> invoicedMap, FollowInvoicePageListVo followInvoicePageListVo) {
|
|
|
|
|
|
|
|
String systemCode = baseController.getSystemCode();
|
|
String systemCode = baseController.getSystemCode();
|
|
|
// 获取当月应收保费,默认为0
|
|
// 获取当月应收保费,默认为0
|
|
@@ -4221,6 +4221,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
.eq("month", month)
|
|
.eq("month", month)
|
|
|
.eq("partner_company_id", partnerCompanyId)
|
|
.eq("partner_company_id", partnerCompanyId)
|
|
|
.eq("system_code", systemCode)
|
|
.eq("system_code", systemCode)
|
|
|
|
|
+ .eq("invoice_type", followInvoicePageListVo.getInvoiceType())
|
|
|
.last("LIMIT 1"); // 取一条即可,或者根据业务取最新的
|
|
.last("LIMIT 1"); // 取一条即可,或者根据业务取最新的
|
|
|
InsFeeFollowOrder dbOrder = insFeeFollowOrderMapper.selectOne(queryWrapper);
|
|
InsFeeFollowOrder dbOrder = insFeeFollowOrderMapper.selectOne(queryWrapper);
|
|
|
if (dbOrder != null) {
|
|
if (dbOrder != null) {
|
|
@@ -4237,6 +4238,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
.eq("month", month)
|
|
.eq("month", month)
|
|
|
.eq("partner_company_id", partnerCompanyId)
|
|
.eq("partner_company_id", partnerCompanyId)
|
|
|
.eq("system_code", systemCode)
|
|
.eq("system_code", systemCode)
|
|
|
|
|
+ .eq("invoice_type", followInvoicePageListVo.getInvoiceType())
|
|
|
.last("LIMIT 1"); // 取一条即可,或者根据业务取最新的
|
|
.last("LIMIT 1"); // 取一条即可,或者根据业务取最新的
|
|
|
InsFeeFollowOrderReconciliation insFeeFollowOrderReconciliation = insFeeFollowOrderReconciliationMapper.selectOne(insFeeFollowOrderReconciliationQueryWrapper);
|
|
InsFeeFollowOrderReconciliation insFeeFollowOrderReconciliation = insFeeFollowOrderReconciliationMapper.selectOne(insFeeFollowOrderReconciliationQueryWrapper);
|
|
|
if (null != insFeeFollowOrderReconciliation){
|
|
if (null != insFeeFollowOrderReconciliation){
|