Browse Source

Merge branch 'dev'

dev
sunyuchao 4 years ago
parent
commit
4487641669
  1. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

5
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@ -1004,7 +1004,8 @@
FROM FROM
( (
SELECT DISTINCT SELECT DISTINCT
date_id dateId, project_total projectCount, closed_total closedProjectCount <!-- 平阴的三个街道的数据在表里同一天会存在两条,一条是上报的一条是小程序统计的,所以查询时需要sum -->
date_id dateId, SUM(project_total) projectCount, SUM(closed_total) closedProjectCount
<choose> <choose>
<when test='dataType == "agency"'> <when test='dataType == "agency"'>
, agency_id orgId , agency_id orgId
@ -1028,6 +1029,7 @@
<if test='endTime != "" and endTime != null '> <if test='endTime != "" and endTime != null '>
AND date_id <![CDATA[<=]]> #{endTime} AND date_id <![CDATA[<=]]> #{endTime}
</if> </if>
GROUP BY date_id, agency_id
ORDER BY date_id ASC ORDER BY date_id ASC
</if> </if>
<if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '> <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
@ -1035,6 +1037,7 @@
AND date_id <![CDATA[>=]]> #{startTime} AND date_id <![CDATA[>=]]> #{startTime}
</if> </if>
AND date_id <![CDATA[<=]]> #{endTime} AND date_id <![CDATA[<=]]> #{endTime}
GROUP BY date_id, agency_id
ORDER BY date_id DESC ORDER BY date_id DESC
</if> </if>
<choose> <choose>

Loading…
Cancel
Save