Merge branch 'dev_bugfix_ljj' into develop

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-report.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-report.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 600M
+          memory: 1600M

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -172,7 +172,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         List<CategoryAnalysisResultDTO> resultList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(resultDTOList)) {
             for (CategoryAnalysisResultDTO dto : resultDTOList) {
-                CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), dto.getCategoryOriginCustomerId());
+                CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId);
                 if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) {
                     log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId));
                     continue;

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

@@ -388,6 +388,9 @@
             ROUND((ROUND(sy.govern_ablity,1) * sy.GOVERN_ABLITY_WEIGHT),1) AS governAbility,
             ROUND((ROUND(sy.party_dev_ablity,1) * sy.PARTY_DEV_WEIGHT),1) AS partyDevAbility,
             ROUND((ROUND(sy.service_ablity,1) * sy.SERVICE_ABLITY_WEIGHT),1) AS serviceAbility,
+            ROUND(sy.govern_ablity,1) AS originGovernAbility,
+            ROUND(sy.party_dev_ablity,1) AS originPartyDevAbility,
+            ROUND(sy.service_ablity,1) AS originServiceAbility,
             sy.ORG_ID as orgId,
             scg.area_code as areaCode
         FROM screen_customer_grid  scg

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>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -488,30 +488,32 @@
     </select>
     <select id="selectGridClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.ORG_ID,
+            a.GRID_ID,
             a.count AS "sum",
-            IFNULL(b.count,0)AS "count"
+            IFNULL( b.count, 0 ) AS "count"
         FROM
-            (SELECT ORG_ID,
-                    COUNT(DISTINCT PROJECT_ID) AS "count"
-             FROM fact_origin_project_log_daily
-             WHERE( ACTION_CODE = 'created' OR ACTION_CODE = 'transfer')
-               AND IS_ACTIVE = 0
-               AND ORG_TYPE = 'grid'
-               AND CUSTOMER_ID = #{customerId}
-               AND MONTH_ID = #{monthId}
-             GROUP BY ORG_ID) a
-                LEFT JOIN
-            (SELECT fl.ORG_ID,
-                    COUNT(DISTINCT fl.PROJECT_ID) AS "count"
-             FROM fact_origin_project_log_daily fl
-                      INNER JOIN fact_origin_project_main_daily fm ON fl.PROJECT_ID = fm.ID AND fm.PROJECT_STATUS = 'closed'
-             WHERE( fl.ACTION_CODE = 'created' OR fl.ACTION_CODE = 'transfer')
-               AND fl.IS_ACTIVE = 0
-               AND fl.ORG_TYPE = 'grid'
-               AND fl.CUSTOMER_ID = #{customerId}
-               AND fl.MONTH_ID = #{monthId}
-             GROUP BY fl.ORG_ID) b ON a.ORG_ID = b.ORG_ID
+            ( SELECT
+                    GRID_ID,
+                    COUNT( ID ) AS "count"
+                FROM
+                    fact_origin_project_main_daily
+                WHERE
+                    CUSTOMER_ID = #{customerId}
+                    AND MONTH_ID = #{monthId}
+                    AND GRID_ID != ''
+                GROUP BY GRID_ID ) a
+        LEFT JOIN
+        ( SELECT
+                GRID_ID,
+                COUNT( ID ) AS "count"
+            FROM fact_origin_project_main_daily
+            WHERE
+                PROJECT_STATUS = 'closed'
+                AND CUSTOMER_ID = #{customerId}
+                AND MONTH_ID = #{monthId}
+                AND GRID_ID != ''
+            GROUP BY GRID_ID ) b
+        ON a.GRID_ID = b.GRID_ID
     </select>
 
     <select id="selectNotReturn" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">