Browse Source

Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

master
zxc 4 years ago
parent
commit
79c0991405
  1. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
  2. 0
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__add_category_tag.sql
  3. 0
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__add_category_tag.sql
  4. 0
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.13__alter_category_tag.sql
  5. 0
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.14__del_category_tag_field.sql

8
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; private ScreenProjectSettleService screenProjectSettleService;
@Autowired @Autowired
private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService; private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
@Autowired
private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
/** /**
* @param extractOriginFormDTO * @param extractOriginFormDTO
@ -209,6 +211,12 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
}catch(Exception e){ }catch(Exception e){
log.error("按天统计:网格内各个分类下的项目总数,customerId为:"+customerId+"dateId为:"+dateId, 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 ======"); log.info("===== extractDaily method end ======");
} }

0
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql → epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__add_category_tag.sql

0
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql → epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__add_category_tag.sql

0
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql → epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.13__alter_category_tag.sql

0
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql → epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.14__del_category_tag_field.sql

Loading…
Cancel
Save