From aea9c2b6f824b79e0ffe8ed475f6218eed3b264c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 23 Jun 2020 11:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/issue/IssueDao.xml            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
index b9b83d0f2f..19e81a0cb5 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -33,7 +33,7 @@
         INNER JOIN
                 dim_agency da ON fiad.AGENCY_ID = da.ID
         WHERE fiad.DEL_FLAG = '0'
-          AND PID = #{agencyId}
+          AND fiad.PID = #{agencyId}
         GROUP BY AGENCY_ID
     </select>
     <!--    获取机关下网格统计信息-->
@@ -60,7 +60,7 @@
                VOTING_INCR,
                SHIFT_PROJECT_INCR,
                CLOSED_INCR,
-               DATE_FORMAT(DATE_ID, '%Y/%m/%d')
+               DATE_FORMAT(DATE_ID, '%Y/%m/%d') AS DATE_NAME
         FROM
             fact_issue_agency_daily fiad
         WHERE DEL_FLAG = '0'
@@ -76,7 +76,7 @@
                VOTING_INCR,
                SHIFT_PROJECT_INCR,
                CLOSED_INCR,
-               DATE_FORMAT(STR_TO_DATE(MONTH_ID,'%Y%m'), '%Y/%m') AS MONTH_ID
+               DATE_FORMAT(STR_TO_DATE(MONTH_ID,'%Y%m'), '%Y/%m') AS DATE_NAME
         FROM
             fact_issue_agency_monthly fiam
         WHERE DEL_FLAG = '0'