mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

人员成交统计问题

Browse Source
This commit is contained in:
mx 2024-11-19 14:40:08 +08:00
parent a6ede150d2
commit 87c95dc479
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
View File

@ -528,6 +528,7 @@ public class HomeServiceImpl implements HomeService {
//记录合同编码，防止重复 //记录合同编码，防止重复
Map<String, String> repeatContractCode = new HashMap<>(); Map<String, String> repeatContractCode = new HashMap<>();
Set< String> repeatContractCodeBusiness = new HashSet<>(); Set< String> repeatContractCodeBusiness = new HashSet<>();
Set<Long> payIdSet = new HashSet<>();
for (UserContractAmountInfo obj : list) { for (UserContractAmountInfo obj : list) {
Long userId = obj.getUserId(); Long userId = obj.getUserId();
UserAmountInfoVo vo = resMap.get(userId); UserAmountInfoVo vo = resMap.get(userId);
@ -542,11 +543,15 @@ public class HomeServiceImpl implements HomeService {
if(obj.getContractCode() != null && obj.getContractCode().length() > 0){ if(obj.getContractCode() != null && obj.getContractCode().length() > 0){
vo.addContractNum(); vo.addContractNum();
} }
if (!payIdSet.contains(obj.getPayId())){
if (obj.getPayedMoney() != null){ if (obj.getPayedMoney() != null){
vo.addPayedSumAmount(obj.getPayedMoney()); vo.addPayedSumAmount(obj.getPayedMoney());
} }
payIdSet.add(obj.getPayId());
}
if(repeatContractCode.get(obj.getContractCode())==null){
if(repeatContractCode.get(obj.getContractCode()) == null){
repeatContractCode.put(obj.getContractCode(), obj.getContractCode()); repeatContractCode.put(obj.getContractCode(), obj.getContractCode());
if (obj.getContractAmount() != null) { if (obj.getContractAmount() != null) {
vo.addSumAmount(obj.getContractAmount()); vo.addSumAmount(obj.getContractAmount());
@ -599,7 +604,7 @@ public class HomeServiceImpl implements HomeService {
for (UserAmountInfoVo v : listData) { for (UserAmountInfoVo v : listData) {
if(!v.getSumAmount().equals(BigDecimal.ZERO)) { if(!v.getSumAmount().equals(BigDecimal.ZERO)) {
v.setAmountPer(v.getSumAmount().multiply(new BigDecimal("100.0")).divide(sumAmount, 2, RoundingMode.HALF_UP).toPlainString() + "%"); v.setAmountPer(v.getSumAmount().multiply(new BigDecimal("100.0")).divide(sumAmount, 2, RoundingMode.HALF_UP).toPlainString() + "%");
}else { } else {
v.setAmountPer("0.00%"); v.setAmountPer("0.00%");
} }
} }

1
pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml
View File

@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.nick_name as nickName, u.nick_name as nickName,
info.contract_code as contractCode, info.contract_code as contractCode,
info.contract_amount as contractAmount, info.contract_amount as contractAmount,
pay.id as payId,
pay.money as payedMoney, pay.money as payedMoney,
bus.id as busId, bus.id as busId,
bus.business_type as businessType, bus.business_type as businessType,