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 c3b90ff1c7..3064505cf6 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 @@ -38,5 +38,5 @@ public interface ScreenProjectCategoryOrgDailyDao { * @param agencyId * @return java.util.List */ - List selectCategoryAnalysis(@Param("agencyId") String agencyId); + List selectCategoryAnalysis(@Param("agencyId") String agencyId,@Param("customerId")String customerId); } \ No newline at end of file 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 97dafab068..c7a1e6cfc5 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 @@ -112,6 +112,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) @Override public List categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO) { - return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId()); + return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(),customerId); } } 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 d2ac38a7f7..97a692ad07 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 @@ -9,22 +9,25 @@ M.PROJECT_TOTAL AS projectTotal FROM screen_project_category_org_daily m left join customer_project_category_dict d - on(m.CATEGORY_CODE=D.CATEGORY_CODE AND D.DEL_FLAG='0') + on(m.CATEGORY_CODE=D.CATEGORY_CODE + AND D.DEL_FLAG='0' + and d.CUSTOMER_ID=#{customerId}) WHERE M.DEL_FLAG = '0' - AND M.ORG_ID = #{agencyId} - AND M.DATE_ID = ( - select - date_id - from - screen_project_category_org_daily - where - del_flag = '0' - and ORG_ID = #{agencyId} - order by - date_id desc, - created_time desc - limit 1 - ) + AND M.ORG_ID = #{agencyId} + AND M.DATE_ID = ( + select + date_id + from + screen_project_category_org_daily + where + del_flag = '0' + and ORG_ID = #{agencyId} + and CUSTOMER_ID=#{customerId} + order by + date_id desc, + created_time desc + limit 1 + ) ORDER BY M.CATEGORY_CODE ASC \ No newline at end of file