From e986e4e5ef3dcd9e4b884ed6039343299e58d932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 3 Nov 2020 14:05:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90kettle=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fallback/UserFeignClientFallback.java | 2 + .../src/main/resources/application.yml | 18 ++ .../epdc/service/impl/UserServiceImpl.java | 6 +- .../epdc_issue_item_category_level1.ktr | 4 +- .../epdc_issue_item_category_level2.ktr | 4 +- .../epdc_issue_item_category_level3.ktr | 166 +++++++++++++++++- ...tem_category_satisfaction_basic_level1.ktr | 4 +- ...tem_category_satisfaction_basic_level2.ktr | 2 +- ...tem_category_satisfaction_basic_level3.ktr | 4 +- ...c_item_category_satisfaction_no_level1.ktr | 4 +- ...c_item_category_satisfaction_no_level2.ktr | 4 +- ...c_item_category_satisfaction_no_level3.ktr | 4 +- ...item_category_satisfaction_very_level1.ktr | 4 +- ...item_category_satisfaction_very_level2.ktr | 4 +- ...item_category_satisfaction_very_level3.ktr | 4 +- .../governanceRankingMonth.kjb | 2 +- ...street_month_new_GRID_ENTITY_OPERATION.ktr | 11 +- 17 files changed, 217 insertions(+), 30 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java index f19fb6bea..b29ec6603 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java @@ -6,7 +6,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.modules.feign.UserFeignClient; +import org.springframework.stereotype.Component; +@Component public class UserFeignClientFallback implements UserFeignClient { @Override diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml index e7415b5cc..e39c7186b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml @@ -40,6 +40,24 @@ spring: username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ +feign: + hystrix: + enabled: true + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 + management: endpoints: web: diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 1959589ed..84d5ee668 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -66,6 +66,7 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.service.*; import com.elink.esua.epdc.util.AppUserUtils; import com.google.common.collect.Lists; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jsoup.helper.StringUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -84,6 +85,7 @@ import java.util.*; * @author qu qu@gmail.com * @since v1.0.0 2019-09-02 */ +@Slf4j @Service public class UserServiceImpl extends BaseServiceImpl implements UserService { @@ -1484,8 +1486,9 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public Result completeRequisiteInfo(CompleteRequisiteUserInfoDTO fromDto) { String userId = fromDto.getUserId(); + log.info("开始企业注册"+userId); UserEntity userEntity = selectUserForCheck(userId, null, fromDto.getMobile()); - + log.info("检查结束"+userId); // 用于更新用户信息 UserEntity updateUser = ConvertUtils.sourceToTarget(fromDto, UserEntity.class); // 党员姓名必须与用户表中原来的姓名一致，否则不更新姓名与昵称。 @@ -1501,6 +1504,7 @@ public class UserServiceImpl extends BaseServiceImpl implem updateUser.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); } baseDao.updateById(updateUser); + log.info("企业结束"+userId); return new Result(); } diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr index df5e3e3e1..bce00afdb 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr @@ -572,7 +572,7 @@ ei.GRID, ei.GRID_ID, '1' AS CATEGORY_TYPE, - SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ),'其它','为民服务') AS CATEGORY_NAME, SUM( ei.ISSUE_STATE = 0 OR ei.ISSUE_STATE = 2 ) AS ISSUE_TOTLE, SUM( ei.ISSUE_STATE = 4 ) AS ITEM_TOTLE, NOW( ) AS CREATED_TIME @@ -664,7 +664,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr index d6409aaaf..5e60469e2 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr @@ -572,7 +572,7 @@ ei.GRID, ei.GRID_ID, '2' AS CATEGORY_TYPE, - SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ),'其它','为民服务') AS CATEGORY_NAME, SUM( ei.ISSUE_STATE = 0 OR ei.ISSUE_STATE = 2 ) AS ISSUE_TOTLE, SUM( ei.ISSUE_STATE = 4 ) AS ITEM_TOTLE, NOW( ) AS CREATED_TIME @@ -664,7 +664,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr index cd179fa29..cda4d1af2 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr @@ -572,7 +572,7 @@ ei.GRID, ei.GRID_ID, '3' AS CATEGORY_TYPE, - SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ),'其它','为民服务') AS CATEGORY_NAME, SUM( ei.ISSUE_STATE = 0 OR ei.ISSUE_STATE = 2 ) AS ISSUE_TOTLE, SUM( ei.ISSUE_STATE = 4 ) AS ITEM_TOTLE, NOW( ) AS CREATED_TIME @@ -590,7 +590,169 @@ N N N - + + + String + normal + GRID + 128 + -1 + 表输入 + GRID + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + GRID_ID + 15 + 0 + 表输入 + GRID_ID + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + CATEGORY_TYPE + 1 + -1 + 表输入 + CATEGORY_TYPE + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + CATEGORY_NAME + 512 + -1 + 表输入 + CATEGORY_NAME + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + ISSUE_TOTLE + 23 + 0 + 表输入 + ISSUE_TOTLE + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + ITEM_TOTLE + 23 + 0 + 表输入 + ITEM_TOTLE + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Timestamp + normal + CREATED_TIME + 0 + -1 + 表输入 + CREATED_TIME + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr index 0f0a23cca..5d276f60d 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr @@ -573,7 +573,7 @@ GRID_ID, '2' AS SATISFACTION_TYPE, '1' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -688,7 +688,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr index 9a9055186..f8eca2131 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr @@ -524,7 +524,7 @@ GRID_ID, '2' AS SATISFACTION_TYPE, '2' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr index 4db8a016d..06ae08bd2 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr @@ -524,7 +524,7 @@ GRID_ID, '2' AS SATISFACTION_TYPE, '3' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -639,7 +639,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 epdc_item_category_satisfaction_basic_level3表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr index c638f3f2e..c7786d095 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr @@ -573,7 +573,7 @@ GRID_ID, '3' AS SATISFACTION_TYPE, '1' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -688,7 +688,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr index e0e413637..155764cfb 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr @@ -524,7 +524,7 @@ GRID_ID, '3' AS SATISFACTION_TYPE, '2' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -639,7 +639,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 epdc_item_category_satisfaction_no_level2表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr index 23d77b883..6fd45fd01 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr @@ -524,7 +524,7 @@ GRID_ID, '3' AS SATISFACTION_TYPE, '3' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -639,7 +639,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 epdc_item_category_satisfaction_no_level3表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr index 9724ae581..c58f6ece2 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr @@ -573,7 +573,7 @@ GRID_ID, '1' AS SATISFACTION_TYPE, '1' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 1 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -688,7 +688,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr index 955c5571e..b0895f43a 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr @@ -524,7 +524,7 @@ GRID_ID, '1' AS SATISFACTION_TYPE, '2' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 2 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -639,7 +639,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 epdc_item_category_satisfaction_very_level2表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr index 0af8fd3c9..43b662d95 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr @@ -524,7 +524,7 @@ GRID_ID, '1' AS SATISFACTION_TYPE, '3' AS CATEGORY_TYPE, - SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ) AS CATEGORY_NAME, + REPLACE(SUBSTRING_INDEX( CATEGORY_FULL_NAME, '-', 3 ),'其它','为民服务') AS CATEGORY_NAME, COUNT(ID) AS ITEM_TOTAL, NOW( ) AS CREATED_TIME FROM @@ -639,7 +639,7 @@ String normal CATEGORY_NAME - 256 + 512 -1 epdc_item_category_satisfaction_very_level3表输入 CATEGORY_NAME diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb index a1aa33c81..fddb297ac 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb @@ -354,7 +354,7 @@ Y N Y - 4 + 2 0 60 3 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr index be75bfd53..33d75ed72 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr @@ -612,7 +612,8 @@ select street.ID as STREET_ID, street.name, - IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) as MONTH_YEAR, + date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) as MONTH_YEAR, + -- IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) as MONTH_YEAR, IFNULL(kge.STATION_ESTABLISHMENT + kge.STAFFING_PLACEMENT + kge.GRID_OPERATION,format(round(sum(entity.GRID_ENTITY_OPERATION)/ (select count(grid.id) from meta_sys_dept grid @@ -738,12 +739,12 @@ from FROM meta_epdc_kpi_grid_entity ekg WHERE - ekg.MONTH_YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) + ekg.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' ) AND ekg.DEL_FLAG = '0' and ekg.DEPT_TYPE_KEY='grid_party') entity on FIND_IN_SET(street.ID,entity.ALL_DEPT_IDS) - and entity.MONTH_YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) + and entity.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' ) left join meta_epdc_kpi_grid_entity kge on kge.DEPT_ID = street.ID and kge.DEL_FLAG = '0' - and kge.MONTH_YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) + and kge.MONTH_YEAR = date_format( date_add((select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' ) where street.TYPE_KEY='street_party' and street.DEL_FLAG=0 and IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) is not null group by street.id @@ -808,7 +809,7 @@ from String normal MONTH_YEAR - 32 + 7 -1 表输入 MONTH_YEAR