From a66c42e28c84bbbac15d44112298c1ee980e89fc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Feb 2021 16:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=9F=BA=E6=9C=AC=E6=83=85?=
 =?UTF-8?q?=E5=86=B5-=E9=A5=BC=E7=8A=B6=E5=9B=BE=E6=A6=82=E5=86=B5=20?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/ParymemberFormDTO.java            |  5 -----
 .../screen/ScreenUserTotalDataDao.java                |  1 -
 .../screen/impl/GrassrootsPartyDevServiceImpl.java    |  7 +------
 .../mapper/screen/ScreenUserTotalDataDao.xml          | 11 -----------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
index 15b3e36477..fdf525f37b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
@@ -21,9 +21,4 @@ public class ParymemberFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {Parymember.class})
     private String agencyId;
-
-    /**
-     * 目前只有平阴在传，默认赋值：370124
-     */
-    private String areaCode;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
index 8a50ec4c61..653cf3f606 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
@@ -39,7 +39,6 @@ public interface ScreenUserTotalDataDao {
      * @date 2020.08.18 15:17
      **/
     PartymemberPercentResultDTO selectAgencyPartymemberPercent(@Param("agencyId")String agencyId);
-    PartymemberPercentResultDTO selectAgencyPartymemberPercentNew(@Param("agencyId")String agencyId);
 
     /**
      * @Description  查询top区概况
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
index 7905306f8c..30e3d5d32e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -63,12 +63,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     @Override
     public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
 
-        PartymemberPercentResultDTO result = new PartymemberPercentResultDTO();
-        if (StringUtils.isEmpty(param.getAreaCode())) {
-            result = screenUserTotalDataDao.selectAgencyPartymemberPercent(param.getAgencyId());
-        }else {
-            result = screenUserTotalDataDao.selectAgencyPartymemberPercentNew(param.getAgencyId());
-        }
+        PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercent(param.getAgencyId());
         if(null == result){
             result = new PartymemberPercentResultDTO();
             logger.warn("com.epmet.datareport.service.screen.impl.GrassrootsPartyDevServiceImpl.partymemberBaseInfo:未查询出指定agencyId下的党员基础信息数据，agencyId :: {}",param.getAgencyId());
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 986e077712..57b2959430 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -67,15 +67,4 @@
             ISSUE_TOTAL desc,
             PROJECT_TOTAL desc
     </select>
-    <select id="selectAgencyPartymemberPercentNew" resultType="com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO">
-        SELECT
-            SUM( td.PARTY_TOTAL ) AS partyMemberTotal,
-            SUM( td.USER_TOTAL ) AS platFormTotal
-        FROM
-            screen_user_total_data td
-            LEFT JOIN screen_customer_agency ca ON ca.AGENCY_ID = td.PARENT_ID
-        WHERE
-            td.DEL_FLAG = '0'
-          AND ca.AREA_CODE LIKE (SELECT AREA_CODE FROM screen_customer_agency WHERE DEL_FLAG = '0' AND AGENCY_ID = #{agencyId})
-    </select>
 </mapper>
\ No newline at end of file