删除测试log
This commit is contained in:
parent
21185aa726
commit
a21540fc27
@ -191,24 +191,19 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
|
|||||||
lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
|
lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
|
||||||
lqw.orderByDesc("finish_date");
|
lqw.orderByDesc("finish_date");
|
||||||
|
|
||||||
logger.info("1222222222");
|
|
||||||
// lqw.groupBy("com.id");
|
// lqw.groupBy("com.id");
|
||||||
Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw);
|
Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw);
|
||||||
logger.info("333333333333333");
|
|
||||||
if (!result.getRecords().isEmpty()){
|
if (!result.getRecords().isEmpty()){
|
||||||
//填充代账服务项目
|
//填充代账服务项目
|
||||||
List<Long> companyIds = result.getRecords().stream().map(PsCompanyInfoVo::getId).collect(Collectors.toList());
|
List<Long> companyIds = result.getRecords().stream().map(PsCompanyInfoVo::getId).collect(Collectors.toList());
|
||||||
QueryWrapper<PsContractBusiness> queryParam = Wrappers.query();
|
QueryWrapper<PsContractBusiness> queryParam = Wrappers.query();
|
||||||
queryParam.in("cc.company_id", companyIds);
|
queryParam.in("cc.company_id", companyIds);
|
||||||
logger.info("44444444444");
|
|
||||||
List<PsContractBusinessVo> psContractBusinessVos = contractBusinessMapper.selectTuoGuanBusinessList(queryParam);
|
List<PsContractBusinessVo> psContractBusinessVos = contractBusinessMapper.selectTuoGuanBusinessList(queryParam);
|
||||||
Map<Long, List<PsContractBusinessVo>> contractBusinessVoMap = psContractBusinessVos.stream().collect(Collectors.groupingBy(PsContractBusinessVo::getCompanyId, Collectors.toList()));
|
Map<Long, List<PsContractBusinessVo>> contractBusinessVoMap = psContractBusinessVos.stream().collect(Collectors.groupingBy(PsContractBusinessVo::getCompanyId, Collectors.toList()));
|
||||||
|
|
||||||
QueryWrapper<PsCompanyInfo> query = Wrappers.query();
|
QueryWrapper<PsCompanyInfo> query = Wrappers.query();
|
||||||
query.in("cf.company_id", companyIds);
|
query.in("cf.company_id", companyIds);
|
||||||
logger.info("5555555555555");
|
|
||||||
List<SysUserVo> sysUsers = baseMapper.selectFollowUser(query);
|
List<SysUserVo> sysUsers = baseMapper.selectFollowUser(query);
|
||||||
logger.info("666666666666");
|
|
||||||
Map<Long, List<SysUserVo>> userMap = new HashMap<>();
|
Map<Long, List<SysUserVo>> userMap = new HashMap<>();
|
||||||
for (SysUserVo sysUser : sysUsers) {
|
for (SysUserVo sysUser : sysUsers) {
|
||||||
List<SysUserVo> list = userMap.computeIfAbsent(sysUser.getCompanyId(), aLong -> new ArrayList<>());
|
List<SysUserVo> list = userMap.computeIfAbsent(sysUser.getCompanyId(), aLong -> new ArrayList<>());
|
||||||
@ -233,7 +228,6 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.info("777777777777");
|
|
||||||
return TableDataInfo.build(result);
|
return TableDataInfo.build(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user