elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【kettle修改】

feature/dangjian
李鹏飞 6 years ago
parent
6dbb9dd32c
commit
e986e4e5ef
17 changed files with 217 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
  2. 18
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
  3. 6
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  4. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr
  5. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr
  6. 166
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr
  7. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr
  8. 2
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr
  9. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr
  10. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr
  11. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr
  12. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr
  13. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr
  14. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr
  15. 4
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr
  16. 2
      esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb
  17. 11
      esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
View File

@ -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

18
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
View File

@ -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:

6
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
View File

@ -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<UserDao, UserEntity> implements UserService {
@ -1484,8 +1486,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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<UserDao, UserEntity> implem
updateUser.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
}
baseDao.updateById(updateUser);
log.info("企业结束"+userId);
return new Result();
}

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level1.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level2.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>

166
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_category_level3.ktr
View File

@ -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 @@
<variables_active>N</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta/>
<row-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>
<name>GRID</name>
<length>128</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>GRID</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRID_ID</name>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRID_ID</comments>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_TYPE</name>
<length>1</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_TYPE</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>ISSUE_TOTLE</name>
<length>23</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>ISSUE_TOTLE</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>ITEM_TOTLE</name>
<length>23</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>ITEM_TOTLE</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Timestamp</type>
<storagetype>normal</storagetype>
<name>CREATED_TIME</name>
<length>0</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CREATED_TIME</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/>
<cluster_schema/>
<remotesteps>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level1.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>

2
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level2.ktr
View File

@ -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

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_basic_level3.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>epdc_item_category_satisfaction_basic_level3表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level1.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level2.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>epdc_item_category_satisfaction_no_level2表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_no_level3.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>epdc_item_category_satisfaction_no_level3表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level1.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level2.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>epdc_item_category_satisfaction_very_level2表输入</origin>
<comments>CATEGORY_NAME</comments>

4
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_item_category_satisfaction_very_level3.ktr
View File

@ -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 @@
<type>String</type>
<storagetype>normal</storagetype>
<name>CATEGORY_NAME</name>
<length>256</length>
<length>512</length>
<precision>-1</precision>
<origin>epdc_item_category_satisfaction_very_level3表输入</origin>
<comments>CATEGORY_NAME</comments>

2
esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb
View File

@ -354,7 +354,7 @@
<start>Y</start>
<dummy>N</dummy>
<repeat>Y</repeat>
<schedulerType>4</schedulerType>
<schedulerType>2</schedulerType>
<intervalSeconds>0</intervalSeconds>
<intervalMinutes>60</intervalMinutes>
<hour>3</hour>

11
esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr
View File

@ -612,7 +612,8 @@
<sql>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
<type>String</type>
<storagetype>normal</storagetype>
<name>MONTH_YEAR</name>
<length>32</length>
<length>7</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>MONTH_YEAR</comments>

Write Preview
Loading…
Cancel
Save