From 6ec26edad96f47a47e76433712dc8946bec99056 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 24 Sep 2020 14:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=A8=A1=E8=8C=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=BD=E5=8F=96=E5=88=B0=E5=A4=A7=E5=B1=8F=E8=A1=A8?= =?UTF-8?q?screen=5Fpioneer=5FdataV0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../screen/ScreenPioneerDataDao.java | 14 +++-- .../screen/ScreenPioneerDataEntity.java | 7 +++ .../screen/ScreenPioneerDataDao.xml | 52 ++++++++++++++----- 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 49dbbb94d5..76cfc7865d 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epmet_dba password: EpmEt-dbA-UsEr #oracle配置 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPioneerDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPioneerDataDao.java index 85d2777802..14ffbe7c6e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPioneerDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPioneerDataDao.java @@ -75,12 +75,20 @@ public interface ScreenPioneerDataDao extends BaseDao { /** * @return java.util.List * @param customerId - * @param agencyLevel * @author yinzuomei - * @description 初始化好orgType="agency"的插入对象 + * @description 初始化好社区, orgType="agency"的插入对象 * @Date 2020/9/22 15:03 **/ - List initAgencyPioneerDataList(@Param("customerId")String customerId, @Param("agencyLevel")String agencyLevel); + List initCommunityPioneerDataList(@Param("customerId")String customerId); + + /** + * @return java.util.List + * @param customerId + * @author yinzuomei + * @description 初始化好非社区的, orgType="agency"的插入对象 + * @Date 2020/9/24 13:45 + **/ + List initExceptCommunityPioneerDataList(@Param("customerId")String customerId); /** * @return void diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java index a51b8b6449..c03d32f1df 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java @@ -117,4 +117,11 @@ public class ScreenPioneerDataEntity extends BaseEpmetEntity { */ private String dataEndTime; + + /** + * + */ + private String pid; + private String agencyPids; + private String agencyPath; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml index 0902f55135..27a201b331 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml @@ -113,7 +113,7 @@ - SELECT sca.CUSTOMER_ID, 'agency' AS ORG_TYPE, @@ -121,22 +121,48 @@ sca.PID AS PARENT_ID, sca.AGENCY_NAME AS ORG_NAME, 0 as ISSUE_TOTAL, - 0 asISSUE_RATIO, - 0 asTOPIC_TOTAL, - 0 asTOPIC_RATIO, - 0 asPUBLISH_ISSUE_TOTAL, - 0 asPUBLISH_ISSUE_RATIO, - 0 asSHIFT_PROJECT_TOTAL, - 0 asSHIFT_PROJECT_RATIO, - 0 asRESOLVED_PROJECT_TOTAL, - 0 asRESOLVED_PROJECT_RATIO + 0 as ISSUE_RATIO, + 0 as TOPIC_TOTAL, + 0 as TOPIC_RATIO, + 0 as PUBLISH_ISSUE_TOTAL, + 0 as PUBLISH_ISSUE_RATIO, + 0 as SHIFT_PROJECT_TOTAL, + 0 as SHIFT_PROJECT_RATIO, + 0 as RESOLVED_PROJECT_TOTAL, + 0 as RESOLVED_PROJECT_RATIO + FROM + screen_customer_agency sca + WHERE + sca.DEL_FLAG = '0' + and sca.`LEVEL`='community' + AND sca.CUSTOMER_ID = #{customerId} + + + +