议题数据查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java

@@ -18,27 +18,30 @@ public interface IssueDao {
 	 * @author zhaoqifeng
 	 * @date 2020/6/22 15:19
 	 * @param agencyId
+	 * @param dateId
 	 * @return com.epmet.issue.dto.result.IssueDataDTO
 	 */
-	IssueDataDTO selectAgencyInfo(@Param("agencyId") String agencyId);
+	IssueDataDTO selectAgencyInfo(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
 	/**
 	 * 获取下级机关统计信息
 	 * @author zhaoqifeng
 	 * @date 2020/6/22 15:20
 	 * @param agencyId
+	 * @param dateId
 	 * @return java.util.List<com.epmet.issue.dto.result.IssueDataDTO>
 	 */
-	List<IssueDataDTO> selectSubAgencyList(@Param("agencyId") String agencyId);
+	List<IssueDataDTO> selectSubAgencyList(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
 	/**
 	 * 获取机关下网格统计信息
 	 * @author zhaoqifeng
 	 * @date 2020/6/22 15:21
 	 * @param agencyId
+	 * @param dateId
 	 * @return java.util.List<com.epmet.issue.dto.result.IssueDataDTO>
 	 */
-	List<IssueDataDTO> selectGridList(@Param("agencyId") String agencyId);
+	List<IssueDataDTO> selectGridList(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
 	/**
 	 * 获取当前机关日增量

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java

@@ -35,11 +35,13 @@ public class IssueServiceImpl implements IssueService {
 	@Override
 	public IssueSummaryInfoResultDTO getSummaryInfo(TokenDto tokenDto) {
 		IssueSummaryInfoResultDTO result = new IssueSummaryInfoResultDTO();
+		//获取当前日期前一天
+		Date date = DateUtils.getBeforeDay(new Date());
+		//获取日期维度
+		String dateId = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
 		String agencyId = getAgencyId(tokenDto);
-		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
+		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId, dateId);
 		if (null == data) {
-			//获取当前日期前一天
-			Date date = DateUtils.getBeforeDay(new Date());
 			result.setAgencyId(agencyId);
 			result.setDateName(DateUtils.format(date, "yyyy.MM.dd"));
 			result.setIssueTotal(NumConstant.ZERO);
@@ -67,7 +69,11 @@ public class IssueServiceImpl implements IssueService {
 	public List<IssueSummaryPieResultDTO> getSummaryPie(TokenDto tokenDto) {
 		List<IssueSummaryPieResultDTO> list = new ArrayList<>();
 		String agencyId = getAgencyId(tokenDto);
-		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
+		//获取当前日期前一天
+		Date date = DateUtils.getBeforeDay(new Date());
+		//获取日期维度
+		String dateId = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
+		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId, dateId);
 		if (null == data) {
 			IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
 			voting.setName(IssueConstant.VOTING_NAME);
@@ -108,7 +114,11 @@ public class IssueServiceImpl implements IssueService {
 	public List<IssueSubAgencyResultDTO> getSubAgency(TokenDto tokenDto) {
 		List<IssueSubAgencyResultDTO> list = new ArrayList<>();
 		String agencyId = getAgencyId(tokenDto);
-		List<IssueDataDTO> dataList = issueDao.selectSubAgencyList(agencyId);
+		//获取当前日期前一天
+		Date date = DateUtils.getBeforeDay(new Date());
+		//获取日期维度
+		String dateId = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
+		List<IssueDataDTO> dataList = issueDao.selectSubAgencyList(agencyId, dateId);
 		if(null != dataList) {
 			dataList.forEach(data -> {
 				IssueSubAgencyResultDTO voting = new IssueSubAgencyResultDTO();
@@ -138,7 +148,11 @@ public class IssueServiceImpl implements IssueService {
 	public List<IssueSubGridResultDTO> getSubGrid(TokenDto tokenDto) {
 		List<IssueSubGridResultDTO> list = new ArrayList<>();
 		String agencyId = getAgencyId(tokenDto);
-		List<IssueDataDTO> dataList = issueDao.selectGridList(agencyId);
+		//获取当前日期前一天
+		Date date = DateUtils.getBeforeDay(new Date());
+		//获取日期维度
+		String dateId = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
+		List<IssueDataDTO> dataList = issueDao.selectGridList(agencyId, dateId);
 		if(null != dataList) {
 			dataList.forEach(data -> {
 				IssueSubGridResultDTO voting = new IssueSubGridResultDTO();

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -12,12 +12,13 @@
                SHIFT_PROJECT_PERCENT,
                CLOSED_TOTAL,
                CLOSED_PERCENT,
-               MAX(DATE_ID) AS DATE_ID,
-               DATE_FORMAT(MAX(DATE_ID), '%Y.%m.%d') AS DATE_NAME
+               DATE_ID,
+               DATE_FORMAT(DATE_ID, '%Y.%m.%d') AS DATE_NAME
         FROM
             fact_issue_agency_daily fiad
         WHERE DEL_FLAG = '0'
         AND AGENCY_ID = #{agencyId}
+        AND DATE_ID = #{dateId}
     </select>
     <!--    获取下级机关统计信息-->
     <select id="selectSubAgencyList" resultType="com.epmet.issue.dto.result.IssueDataDTO">
@@ -27,13 +28,14 @@
                VOTING_TOTAL,
                SHIFT_PROJECT_TOTAL,
                CLOSED_TOTAL,
-               MAX(DATE_ID) AS DATE_ID
+               DATE_ID AS DATE_ID
         FROM
             fact_issue_agency_daily fiad
         INNER JOIN
                 dim_agency da ON fiad.AGENCY_ID = da.ID
         WHERE fiad.DEL_FLAG = '0'
           AND fiad.PID = #{agencyId}
+          AND fiad.DATE_ID = #{dateId}
         GROUP BY AGENCY_ID
         ORDER BY fiad.ISSUE_TOTAL DESC
     </select>
@@ -45,13 +47,14 @@
                VOTING_TOTAL,
                SHIFT_PROJECT_TOTAL,
                CLOSED_TOTAL,
-               MAX(DATE_ID) AS DATE_ID
+               DATE_ID AS DATE_ID
         FROM
             fact_issue_grid_daily figd
         INNER JOIN
             dim_grid dg ON figd.GRID_ID = dg.ID
         WHERE figd.DEL_FLAG = '0'
           AND figd.AGENCY_ID = #{agencyId}
+          AND figd.DATE_ID = #{dateId}
         GROUP BY GRID_ID
         ORDER BY figd.ISSUE_TOTAL DESC
     </select>