|
|
@@ -157,7 +157,8 @@ public class CockpitServiceImpl implements CockpitService {
|
|
|
Date date = getStartDate(dto.getPeriod());
|
|
|
SysOrg org = getOrgThrowIfNull(dto.getOrgId());
|
|
|
List<WebGA38InfoDto> data = cockpitMapper.orgGA38(org.getPath(), date);
|
|
|
- List<OrgGA38StatisticVo> r = getGA38Children(org, Arrays.asList(OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(), OrgTypeEnum.YINGYE_WANGDIAN.getCode()));
|
|
|
+ //GA38 只统计营业网点 OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(),
|
|
|
+ List<OrgGA38StatisticVo> r = getGA38Children(org, Arrays.asList( OrgTypeEnum.YINGYE_WANGDIAN.getCode()));
|
|
|
for (WebGA38InfoDto orgVo : data) {
|
|
|
for (OrgGA38StatisticVo statisticVo : r) {
|
|
|
if (orgVo.getPath().startsWith(statisticVo.getOrgPath())) {
|