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 35f808ce96..687e8650d6 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 @@ -46,5 +46,5 @@ public interface FactParticipationUserGridDailyDao extends BaseDao selectUserCount(String customerId); + List selectUserCount(@Param("customerId")String customerId,@Param("dateId")String dateId); } \ 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 2d08926ea1..90ccb5a0ed 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 @@ -138,7 +138,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { }else { // 级别为 street,district,city,province List directGridIds = gridService.selectDirectGrid(orgIds); - List userCountList = userGridDailyService.selectUserCount(customerId); + List userCountList = userGridDailyService.selectUserCount(customerId,dateId); agencyIdList.forEach(agency -> { String agencyId = agency.getAgencyId(); List dGridId = new ArrayList<>(); @@ -330,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); + List userCountList = userGridDailyService.selectUserCount(customerId,dateId); // 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 2236b81b7b..0f3ab1e3af 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 @@ -101,5 +101,5 @@ public interface FactParticipationUserGridDailyService extends BaseService selectUserCount(String customerId); + List selectUserCount(String customerId,String dateId); } \ 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 1749707e94..30516acafa 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 @@ -107,8 +107,8 @@ public class FactParticipationUserGridDailyServiceImpl extends BaseServiceImpl selectUserCount(String customerId) { - return baseDao.selectUserCount(customerId); + public List selectUserCount(String customerId,String dateId) { + return baseDao.selectUserCount(customerId,dateId); } } \ 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 8e2c4b4122..30c5f5c39c 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,6 +118,7 @@ fact_participation_user_grid_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} + AND DATE_ID #{dateId}