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

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

@@ -281,10 +281,10 @@
             pd.ALL_PARENT_IDS AS pids,
             pc.`LEVEL`,
             <if test=' status == "closed" '>
-                COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
+                COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
             </if>
             <if test=' status == "all" '>
-                COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
+                COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
             </if>
         FROM screen_project_data pd
         LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
@@ -310,10 +310,10 @@
             pd.ALL_PARENT_IDS AS pids,
             1 AS level,
             <if test=' status == "closed" '>
-                COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
+                COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
             </if>
             <if test=' status == "all" '>
-                COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
+                COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
             </if>
         FROM screen_project_data pd
         LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
@@ -343,10 +343,10 @@
                 #{a.orgType} AS orgType,
                 pc.`LEVEL`,
                 <if test=' status == "closed" '>
-                    COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
+                    COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
                 </if>
                 <if test=' status == "all" '>
-                    COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
+                    COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
                 </if>
             FROM screen_project_data pd
             LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
@@ -369,10 +369,10 @@
                 #{a.orgType} AS orgType,
                 pc.`LEVEL`,
                 <if test=' status == "closed" '>
-                    COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
+                    COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
                 </if>
                 <if test=' status == "all" '>
-                    COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
+                    COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
                 </if>
             FROM screen_project_data pd
             LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')