From d33487737bc289160dcee60f83cf130dfc60069a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 20 Aug 2021 11:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=90=8D=E5=AD=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/CategoryAnalysisResultDTO.java | 7 +++ .../result/CategoryTopAppealResultDTO.java | 7 +++ .../ScreenProjectCategoryOrgDailyDao.java | 2 +- .../screen/impl/ScreenProjectServiceImpl.java | 16 ++----- .../ScreenProjectCategoryOrgDailyDao.xml | 46 ++++++------------- 5 files changed, 31 insertions(+), 47 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java index f91ef35e09..ebbd47cdaa 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result.screen; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.NoArgsConstructor; @@ -33,4 +34,10 @@ public class CategoryAnalysisResultDTO implements Serializable { * 分类编码 */ private String categoryCode; + + /** + * 分类来源客户ID + */ + @JsonIgnore + private String categoryOriginCustomerId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryTopAppealResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryTopAppealResultDTO.java index 6b5a1000ec..1fab9522b4 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryTopAppealResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryTopAppealResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.project.dto.result; import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -30,6 +31,12 @@ public class CategoryTopAppealResultDTO implements Serializable { */ private Integer categoryCount; + /** + * 分类来源客户ID + */ + @JsonIgnore + private String categoryOriginCustomerId; + public CategoryTopAppealResultDTO() { this.categoryId = ""; this.categoryName = ""; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java index 98de75653b..e3cf3d074d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java @@ -42,7 +42,7 @@ public interface ScreenProjectCategoryOrgDailyDao { */ List selectCategoryAnalysis(@Param("agencyId") String agencyId,@Param("customerId")String customerId); - CustomerProjectCategoryDTO selectProjectCategory(@Param("categoryCode")String categoryCode, @Param("customerId")String customerId, @Param("subCustomerIds")List subCustomerIds); + CustomerProjectCategoryDTO selectProjectCategory(@Param("categoryCode")String categoryCode, @Param("customerId")String customerId); /** * @Description 查询事件分类 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index afd527d643..cbfb044895 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -159,13 +159,8 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { List resultDTOList = screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(), customerId); List resultList = new ArrayList<>(); if (!CollectionUtils.isEmpty(resultDTOList)) { - Result> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(customerId); - List subCustomerIds = new ArrayList<>(); - if (crmRes.success() && !CollectionUtils.isEmpty(crmRes.getData())) { - subCustomerIds = crmRes.getData(); - } for (CategoryAnalysisResultDTO dto : resultDTOList) { - CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId, subCustomerIds); + CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), dto.getCategoryOriginCustomerId()); if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) { log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId)); continue; @@ -224,15 +219,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { if (CollectionUtils.isEmpty(result)){ return new ArrayList<>(); } - Result> sonCustomer = operCrmOpenFeignClient.getAllSubCustomerIds(customerId); - List subCustomerIds = new ArrayList<>(); - if (sonCustomer.success() && !CollectionUtils.isEmpty(sonCustomer.getData())) { - subCustomerIds = sonCustomer.getData(); - } for (CategoryTopAppealResultDTO r : result) { - CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(r.getCategoryId(), customerId, subCustomerIds); + CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(r.getCategoryId(), r.getCategoryOriginCustomerId()); if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) { - log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", r.getCategoryId(), customerId)); + log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", r.getCategoryId(), r.getCategoryOriginCustomerId())); continue; } r.setCategoryName(projectCategoryDTO.getCategoryName()); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 4bd5e6a20d..5731b27e2b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -8,7 +8,8 @@ SELECT '' AS categoryName, M.PROJECT_TOTAL AS projectTotal, m.DATE_ID as dateId, - m.CATEGORY_CODE as categoryCode + m.CATEGORY_CODE as categoryCode, + m.CATEGORY_ORIGIN_CUSTOMER_ID FROM screen_project_category_org_daily m WHERE M.DEL_FLAG = '0' and m.level='1' @@ -33,46 +34,25 @@