|
|
@ -252,6 +252,9 @@ public class ChanjetManager {
|
|
|
|
if(CollUtil.isNotEmpty(result.getData())){
|
|
|
|
if(CollUtil.isNotEmpty(result.getData())){
|
|
|
|
|
|
|
|
|
|
|
|
List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("客户") > -1).collect(Collectors.toList());
|
|
|
|
List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("客户") > -1).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(CollUtil.isNotEmpty(dataList)){
|
|
|
|
|
|
|
|
|
|
|
|
Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
|
|
|
|
Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
|
|
|
|
|
|
|
|
|
|
|
|
List<CustomerDO> customerDOList = customerMapper.selectList(new LambdaQueryWrapper<CustomerDO>() {{
|
|
|
|
List<CustomerDO> customerDOList = customerMapper.selectList(new LambdaQueryWrapper<CustomerDO>() {{
|
|
|
@ -298,6 +301,9 @@ public class ChanjetManager {
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
maxTs = null;
|
|
|
|
maxTs = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
maxTs = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}while (maxTs != null);
|
|
|
|
}while (maxTs != null);
|
|
|
|
|
|
|
|
|
|
|
@ -320,6 +326,8 @@ public class ChanjetManager {
|
|
|
|
if(CollUtil.isNotEmpty(result.getData())){
|
|
|
|
if(CollUtil.isNotEmpty(result.getData())){
|
|
|
|
|
|
|
|
|
|
|
|
List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("供应商") > -1).collect(Collectors.toList());
|
|
|
|
List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("供应商") > -1).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(CollUtil.isNotEmpty(dataList)){
|
|
|
|
Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
|
|
|
|
Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
|
|
|
|
|
|
|
|
|
|
|
|
List<SupplierDO> doList = supplierMapper.selectList(new LambdaQueryWrapper<SupplierDO>() {{
|
|
|
|
List<SupplierDO> doList = supplierMapper.selectList(new LambdaQueryWrapper<SupplierDO>() {{
|
|
|
@ -367,6 +375,10 @@ public class ChanjetManager {
|
|
|
|
maxTs = null;
|
|
|
|
maxTs = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
maxTs = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}while (maxTs != null);
|
|
|
|
}while (maxTs != null);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|