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

Compare commits

base: mengxu:486828f9f3693aa5295af98e8e00075e7448a41d
Branches Tags
mengxu:main
...
compare: mengxu:79a441234fec277bdc60805cd6f56df9163c10c9
Branches Tags
mengxu:main

2 Commits
486828f9f3 ... 79a441234f

Author SHA1 Message Date
mx
79a441234f Merge branch 'main' of http://124.236.46.74:9103/mengxu/pusong-crm into main 
# Conflicts:
#	pusong-admin/src/main/resources/application-dev.yml
 2024-12-31 14:42:08 +08:00
mx
95c825f2b8 bug 2024-12-31 14:34:14 +08:00
2 changed files with 16 additions and 11 deletions
Show Stats Expand all files Collapse all files

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
View File

@ -134,8 +134,9 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
} }
Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay()); Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay());
List<String> codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList();
if(CollectionUtils.isNotEmpty(res.getRecords())){
List<String> codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList();
QueryWrapper<PsCompanyInfoVo> wq = Wrappers.<PsCompanyInfoVo>query() QueryWrapper<PsCompanyInfoVo> wq = Wrappers.<PsCompanyInfoVo>query()
.eq("com.del_flag", "0") .eq("com.del_flag", "0")
.eq("pcc.del_flag","0") .eq("pcc.del_flag","0")
@ -143,8 +144,6 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
List<PsCompanyInfoVo> list = companyInfoMapper.selectContractServiceCompany(wq); List<PsCompanyInfoVo> list = companyInfoMapper.selectContractServiceCompany(wq);
Map<String, List<PsCompanyInfoVo>> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode)); Map<String, List<PsCompanyInfoVo>> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode));
if(CollectionUtils.isNotEmpty(res.getRecords())){
res.getRecords().forEach(item->{ res.getRecords().forEach(item->{
if (item.getContractAmount() != null) if (item.getContractAmount() != null)
item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney())); item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney()));

8
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
View File

@ -772,8 +772,14 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
detailBos.add(item); detailBos.add(item);
for (PsContractBusinessDetailBo detailBo : item.getDetailBos()) { for (PsContractBusinessDetailBo detailBo : item.getDetailBos()) {
String dictLabel = "";
if (StringUtils.isEmpty(detailBo.getBusinessProject())){
dictLabel = detailBo.getBusinessProjectLabel();
}else{
contractType = dictDataService.selectDict("service_project", detailBo.getBusinessProject()); contractType = dictDataService.selectDict("service_project", detailBo.getBusinessProject());
String dictLabel = contractType.getDictLabel(); dictLabel = contractType.getDictLabel();
}
String remark = contractType.getRemark(); String remark = contractType.getRemark();
if (!StringUtils.isEmpty(remark)){ if (!StringUtils.isEmpty(remark)){
JSONObject jsonObject = JSONObject.parseObject(remark); JSONObject jsonObject = JSONObject.parseObject(remark);