Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

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

@@ -135,7 +135,7 @@
         AND pd.ORG_TYPE = 'agency'
         AND pd.PROJECT_LEVEL != 0
         AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-        AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
+        AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
         )
         UNION ALL
         (SELECT pd.PROJECT_LEVEL
@@ -145,7 +145,7 @@
         AND pd.ORG_TYPE = 'grid'
         AND pd.PROJECT_LEVEL != 0
         AND scg.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-        AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
+        AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
         )
         UNION ALL
         (SELECT pd.PROJECT_LEVEL
@@ -155,7 +155,7 @@
         AND pd.ORG_TYPE = 'department'
         AND pd.PROJECT_LEVEL != 0
         AND scd.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-        AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
+        AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH))
         )
     </select>