|
@@ -135,7 +135,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
List<QueryWxFactoryVO> queryWxFactoryActivationNumber = reportServiceMapper.queryWxFactoryActivationNumber(queryWxFactoryReq,getMonth());
|
|
|
Map<String, Long> activationNumberMap = queryWxFactoryActivationNumber.stream().collect(Collectors.toMap(QueryWxFactoryVO::getMarch, QueryWxFactoryVO::getActivation));
|
|
|
queryWxFactorySumNumber.forEach(factorySumNumber->{
|
|
|
- Long aLong = (null == activationNumberMap.get(factorySumNumber.getMarch()) ? 0l : activationNumberMap.get(factorySumNumber.getMarch()));
|
|
|
+ Long aLong = (null == activationNumberMap.get(factorySumNumber.getMarch()) ? 0L : activationNumberMap.get(factorySumNumber.getMarch()));
|
|
|
factorySumNumber.setActivation(aLong);
|
|
|
});
|
|
|
List<QueryWxFactoryRes.QueryWxFactoryBean> queryWxFactoryBeans = PojoConverterUtils.copyList(queryWxFactorySumNumber, QueryWxFactoryRes.QueryWxFactoryBean.class);
|
|
@@ -153,7 +153,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
List<QueryWxFactoryVO> queryWxFactoryActivationNumber = reportServiceMapper.queryWxFactoryActivationNumber(queryWxFactoryReq,null);
|
|
|
Map<String, Long> activationNumberMap = queryWxFactoryActivationNumber.stream().collect(Collectors.toMap(QueryWxFactoryVO::getMarch, QueryWxFactoryVO::getActivation));
|
|
|
queryWxFactorySumNumber.forEach(factorySumNumber->{
|
|
|
- Long aLong = (null == activationNumberMap.get(factorySumNumber.getMarch()) ? 0l : activationNumberMap.get(factorySumNumber.getMarch()));
|
|
|
+ Long aLong = (null == activationNumberMap.get(factorySumNumber.getMarch()) ? 0L : activationNumberMap.get(factorySumNumber.getMarch()));
|
|
|
factorySumNumber.setActivation(aLong);
|
|
|
});
|
|
|
List<QueryWxFactoryRes.QueryWxFactoryBean> queryWxFactoryBeans = PojoConverterUtils.copyList(queryWxFactorySumNumber, QueryWxFactoryRes.QueryWxFactoryBean.class);
|