From 87e0cb75dff6b560afa0d5add7c4f0cb81dba754 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Apr 2021 14:41:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3sql=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...V0.0.7__add_category_tag.sql => V0.0.11__add_category_tag.sql} | 0 ...V0.0.8__add_category_tag.sql => V0.0.12__add_category_tag.sql} | 0 ...11__alter_category_tag.sql => V0.0.13__alter_category_tag.sql} | 0 ...category_tag_field.sql => V0.0.14__del_category_tag_field.sql} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.7__add_category_tag.sql => V0.0.11__add_category_tag.sql} (100%) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.8__add_category_tag.sql => V0.0.12__add_category_tag.sql} (100%) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.11__alter_category_tag.sql => V0.0.13__alter_category_tag.sql} (100%) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.12__del_category_tag_field.sql => V0.0.14__del_category_tag_field.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__add_category_tag.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__add_category_tag.sql diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__add_category_tag.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__add_category_tag.sql diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.13__alter_category_tag.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.13__alter_category_tag.sql diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.14__del_category_tag_field.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.14__del_category_tag_field.sql From 0d83b40532c343b36a333b259404aa66eac2a8d1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Apr 2021 16:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index e145f3e1bf..9cdd394e67 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -67,6 +67,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { private ScreenProjectSettleService screenProjectSettleService; @Autowired private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService; + @Autowired + private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService; /** * @param extractOriginFormDTO @@ -209,6 +211,12 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch(Exception e){ log.error("按天统计：网格内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e); } + // 按天统计：组织内各个分类下的项目总数 + try{ + projectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId); + }catch(Exception e){ + log.error("按天统计：组织内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e); + } log.info("===== extractDaily method end ======"); }