党员基本情况-饼状图概况 撤回

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;
 }

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区概况

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());

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>