From 27c543b9ccb14821dfca1ef037114409dd5e28e6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 14:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=95=B0=E6=8D=AE=E6=8A=BD?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/stats/user/FactParticipationUserGridDailyDao.java | 3 +-- .../extract/toscreen/impl/PartyBaseInfoServiceImpl.java | 8 ++------ .../stats/user/FactParticipationUserGridDailyService.java | 3 +-- .../impl/FactParticipationUserGridDailyServiceImpl.java | 5 ++--- .../stats/user/FactParticipationUserGridDailyDao.xml | 1 - 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java index fd0b7d2a86..35f808ce96 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java @@ -43,9 +43,8 @@ public interface FactParticipationUserGridDailyDao extends BaseDao selectUserCount(String customerId, String dateId); + List selectUserCount(String customerId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java index f30e987bb9..2d08926ea1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.epmet.service.evaluationindex.screen.ScreenCpcBaseDataService; import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService; import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService; import com.epmet.service.stats.DimCustomerPartymemberService; -import com.epmet.service.stats.user.FactParticipationUserAgencyDailyService; import com.epmet.service.stats.user.FactParticipationUserGridDailyService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; @@ -45,8 +44,6 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { @Autowired private FactParticipationUserGridDailyService userGridDailyService; @Autowired - private FactParticipationUserAgencyDailyService userAgencyDailyService; - @Autowired private ScreenCpcBaseDataService cpcBaseDataService; /** @@ -104,7 +101,6 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { List result = new ArrayList<>(); if (isGrid == true){ // 是 community 级别，子级为gridId - List userCountList = userGridDailyService.selectUserCount(customerId, dateId); agencyIdList.forEach(agency -> { GridPartyDTO gridPartyDTO = gridParty(customerId, dateId, agency); result.addAll(gridPartyDTO.getResult()); @@ -142,7 +138,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { }else { // 级别为 street，district，city，province List directGridIds = gridService.selectDirectGrid(orgIds); - List userCountList = userGridDailyService.selectUserCount(customerId, dateId); + List userCountList = userGridDailyService.selectUserCount(customerId); agencyIdList.forEach(agency -> { String agencyId = agency.getAgencyId(); List dGridId = new ArrayList<>(); @@ -334,7 +330,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { public GridPartyDTO gridParty(String customerId,String dateId,CustomerAgencyInfoResultDTO agency){ List result = new ArrayList<>(); List orgIds = new ArrayList<>(); - List userCountList = userGridDailyService.selectUserCount(customerId, dateId); + List userCountList = userGridDailyService.selectUserCount(customerId); // 1. 处理社区下的所有网格中的党员信息 String agencyId = agency.getAgencyId(); // 获取下级所有agencyId【根据agencyMap中的level判断下级orgId是否是gridId】(此处直接作为gridId) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java index 6dba137e58..2236b81b7b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java @@ -98,9 +98,8 @@ public interface FactParticipationUserGridDailyService extends BaseService selectUserCount(String customerId,String dateId); + List selectUserCount(String customerId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java index 1b4e69ecc9..1749707e94 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java @@ -103,13 +103,12 @@ public class FactParticipationUserGridDailyServiceImpl extends BaseServiceImpl selectUserCount(String customerId, String dateId) { - return baseDao.selectUserCount(customerId, dateId); + public List selectUserCount(String customerId) { + return baseDao.selectUserCount(customerId); } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactParticipationUserGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactParticipationUserGridDailyDao.xml index 96e16db5be..8e2c4b4122 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactParticipationUserGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactParticipationUserGridDailyDao.xml @@ -118,7 +118,6 @@ fact_participation_user_grid_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND DATE_ID = #{dateId}