luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into release_temp

dev
zxc 4 years ago
parent
3585b3c9dc 4e59c3baf2
commit
7677e4c9b5
1 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

24
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
View File

@ -280,10 +280,10 @@
pd.PARENT_ID AS pid, pd.PARENT_ID AS pid,
pd.ALL_PARENT_IDS AS pids, pd.ALL_PARENT_IDS AS pids,
pc.`LEVEL`, pc.`LEVEL`,
<if test=' status = "closed" '> <if test=' status == "closed" '>
COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
</if> </if>
<if test=' status = "all" '> <if test=' status == "all" '>
COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
</if> </if>
FROM screen_project_data pd FROM screen_project_data pd
@ -296,7 +296,7 @@
AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId} AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
AND pd.ORG_TYPE = 'grid' AND pd.ORG_TYPE = 'grid'
AND pc.level = 2 AND pc.level = 2
<if test=' status = "closed" '> <if test=' status == "closed" '>
AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case') AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
</if> </if>
GROUP BY pd.ORG_ID,pc.CATEGORY_CODE GROUP BY pd.ORG_ID,pc.CATEGORY_CODE
@ -309,10 +309,10 @@
pd.PARENT_ID AS pid, pd.PARENT_ID AS pid,
pd.ALL_PARENT_IDS AS pids, pd.ALL_PARENT_IDS AS pids,
1 AS level, 1 AS level,
<if test=' status = "closed" '> <if test=' status == "closed" '>
COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
</if> </if>
<if test=' status = "all" '> <if test=' status == "all" '>
COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
</if> </if>
FROM screen_project_data pd FROM screen_project_data pd
@ -324,7 +324,7 @@
</foreach> </foreach>
AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId} AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
AND pd.ORG_TYPE = 'grid' AND pd.ORG_TYPE = 'grid'
<if test=' status = "closed" '> <if test=' status == "closed" '>
AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case') AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
</if> </if>
GROUP BY pd.ORG_ID,categoryCode GROUP BY pd.ORG_ID,categoryCode
@ -342,10 +342,10 @@
#{a.pids} AS pids, #{a.pids} AS pids,
#{a.orgType} AS orgType, #{a.orgType} AS orgType,
pc.`LEVEL`, pc.`LEVEL`,
<if test=' status = "closed" '> <if test=' status == "closed" '>
COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
</if> </if>
<if test=' status = "all" '> <if test=' status == "all" '>
COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
</if> </if>
FROM screen_project_data pd FROM screen_project_data pd
@ -354,7 +354,7 @@
AND pc.level = 2 AND pc.level = 2
AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId} AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
AND ALL_PARENT_IDS LIKE #{a.orgId} AND ALL_PARENT_IDS LIKE #{a.orgId}
<if test=' status = "closed" '> <if test=' status == "closed" '>
AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case') AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
</if> </if>
GROUP BY pc.CATEGORY_CODE GROUP BY pc.CATEGORY_CODE
@ -368,10 +368,10 @@
#{a.pids} AS pids, #{a.pids} AS pids,
#{a.orgType} AS orgType, #{a.orgType} AS orgType,
pc.`LEVEL`, pc.`LEVEL`,
<if test=' status = "closed" '> <if test=' status == "closed" '>
COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
</if> </if>
<if test=' status = "all" '> <if test=' status == "all" '>
COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
</if> </if>
FROM screen_project_data pd FROM screen_project_data pd
@ -379,7 +379,7 @@
WHERE pd.DEL_FLAG = '0' WHERE pd.DEL_FLAG = '0'
AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId} AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
AND ALL_PARENT_IDS LIKE #{a.orgId} AND ALL_PARENT_IDS LIKE #{a.orgId}
<if test=' status = "closed" '> <if test=' status == "closed" '>
AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case') AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
</if> </if>
GROUP BY categoryCode GROUP BY categoryCode

Write Preview
Loading…
Cancel
Save