From 1c05c984b4ee55572a784247a6e994804455ac90 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 3 Dec 2021 16:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=BB=84=E7=BB=87=E6=9C=88=E7=BB=9F=E8=AE=A1(screen?= =?UTF-8?q?=5Fproject=5Fquantity=5Forg=5Fmonthly)=E6=8C=89areacode?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E5=AE=A2=E6=88=B7id=EF=BC=8C=E7=BD=91=E6=A0=BC=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=BB=9F=E8=AE=A1=E5=8F=8A=E5=86=85=E9=83=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=90=8E=E6=9C=9F=E5=9C=A8=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/evaluationindex/screen/ScreenCustomerAgencyDao.java | 2 +- .../screen/impl/ScreenProjectOrgDailyServiceImpl.java | 2 +- .../screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java | 2 +- .../mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java index 619e9f2e67..39600d8933 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java @@ -207,7 +207,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao selectAgencyByCustomer(@Param("customerId")String customerId); - List selectAgencyByAreaCode(String areaCode); + List selectAgencyByAreaCode(@Param("customerId") String customerId, @Param("areaCode") String areaCode); /** * @Description 根据areaCode查询下级组织 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java index ec0377ab83..a607cd7e7c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java @@ -220,7 +220,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl agencyInfos = agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode()); + List agencyInfos = agencyDao.selectAgencyByAreaCode(null, rootAgency.getAreaCode()); if (CollectionUtils.isEmpty(agencyInfos)){ log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId)); return; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java index d18f3b6234..d869d38214 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java @@ -245,7 +245,7 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl< */ public void extractionProjectOrgMonthlyMoreCustomer(String customerId,String monthId){ CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId); - List screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode()); + List screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(customerId, rootAgency.getAreaCode()); if (CollectionUtils.isEmpty(screenProjectOrgDailyDTOS)){ log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId)); return; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml index 75ec0bb250..4bf3573340 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml @@ -391,6 +391,7 @@ FROM screen_customer_agency sca WHERE DEL_FLAG = 0 and sca.AREA_CODE like CONCAT(#{areaCode},'%') + AND sca.customer_id = #{customerId}