diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr
new file mode 100644
index 000000000..645c324e4
--- /dev/null
+++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr
@@ -0,0 +1,824 @@
+
+
+
+ epdc_kpi_case_handling
+
+
+
+ Normal
+ 0
+ /
+
+
+
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STATUS
+ Y
+ STATUS
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ STARTDATE
+ Y
+ STARTDATE
+
+
+ ENDDATE
+ Y
+ ENDDATE
+
+
+ LOGDATE
+ Y
+ LOGDATE
+
+
+ DEPDATE
+ Y
+ DEPDATE
+
+
+ REPLAYDATE
+ Y
+ REPLAYDATE
+
+
+ LOG_FIELD
+ Y
+ LOG_FIELD
+
+
+ EXECUTING_SERVER
+ N
+ EXECUTING_SERVER
+
+
+ EXECUTING_USER
+ N
+ EXECUTING_USER
+
+
+ CLIENT
+ N
+ CLIENT
+
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ SEQ_NR
+ Y
+ SEQ_NR
+
+
+ LOGDATE
+ Y
+ LOGDATE
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STEPNAME
+ Y
+ STEPNAME
+
+
+ STEP_COPY
+ Y
+ STEP_COPY
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ INPUT_BUFFER_ROWS
+ Y
+ INPUT_BUFFER_ROWS
+
+
+ OUTPUT_BUFFER_ROWS
+ Y
+ OUTPUT_BUFFER_ROWS
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ LOGGING_OBJECT_TYPE
+ Y
+ LOGGING_OBJECT_TYPE
+
+
+ OBJECT_NAME
+ Y
+ OBJECT_NAME
+
+
+ OBJECT_COPY
+ Y
+ OBJECT_COPY
+
+
+ REPOSITORY_DIRECTORY
+ Y
+ REPOSITORY_DIRECTORY
+
+
+ FILENAME
+ Y
+ FILENAME
+
+
+ OBJECT_ID
+ Y
+ OBJECT_ID
+
+
+ OBJECT_REVISION
+ Y
+ OBJECT_REVISION
+
+
+ PARENT_CHANNEL_ID
+ Y
+ PARENT_CHANNEL_ID
+
+
+ ROOT_CHANNEL_ID
+ Y
+ ROOT_CHANNEL_ID
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STEPNAME
+ Y
+ STEPNAME
+
+
+ STEP_COPY
+ Y
+ STEP_COPY
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ LOG_FIELD
+ N
+ LOG_FIELD
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ METRICS_DATE
+ Y
+ METRICS_DATE
+
+
+ METRICS_CODE
+ Y
+ METRICS_CODE
+
+
+ METRICS_DESCRIPTION
+ Y
+ METRICS_DESCRIPTION
+
+
+ METRICS_SUBJECT
+ Y
+ METRICS_SUBJECT
+
+
+ METRICS_TYPE
+ Y
+ METRICS_TYPE
+
+
+ METRICS_VALUE
+ Y
+ METRICS_VALUE
+
+
+
+
+
+
+
+ 0.0
+ 0.0
+
+ 10000
+ 50
+ 50
+ N
+ Y
+ 50000
+ Y
+
+ N
+ 1000
+ 100
+
+
+
+
+
+
+
+
+ -
+ 2020/02/23 18:06:42.514
+ -
+ 2020/02/23 18:06:42.514
+ H4sIAAAAAAAAAAMAAAAAAAAAAAA=
+ N
+
+
+
+
+ esua.epdc.kpi
+ ${db.mysql.epdc.source.host}
+ MYSQL
+ Native
+ ${esua.epdc.kpi.database}
+ ${db.mysql.epdc.source.port}
+ ${db.mysql.epdc.source.username}
+ ${db.mysql.epdc.source.password}
+
+
+
+
+
+ FORCE_IDENTIFIERS_TO_LOWERCASE
+ N
+
+
+ FORCE_IDENTIFIERS_TO_UPPERCASE
+ N
+
+
+ IS_CLUSTERED
+ N
+
+
+ PORT_NUMBER
+ ${db.mysql.epdc.source.port}
+
+
+ PRESERVE_RESERVED_WORD_CASE
+ Y
+
+
+ QUOTE_ALL_FIELDS
+ N
+
+
+ STREAM_RESULTS
+ Y
+
+
+ SUPPORTS_BOOLEAN_DATA_TYPE
+ Y
+
+
+ SUPPORTS_TIMESTAMP_DATA_TYPE
+ Y
+
+
+ USE_POOLING
+ N
+
+
+
+
+ esua_epdc_analysis
+ ${db.mysql.epdc.target.host}
+ MYSQL
+ Native
+ ${esua.epdc.analysis.database}
+ ${db.mysql.epdc.target.port}
+ ${db.mysql.epdc.target.username}
+ ${db.mysql.epdc.target.password}
+
+
+
+
+
+ EXTRA_OPTION_MYSQL.characterEncoding
+ utf8
+
+
+ FORCE_IDENTIFIERS_TO_LOWERCASE
+ N
+
+
+ FORCE_IDENTIFIERS_TO_UPPERCASE
+ N
+
+
+ IS_CLUSTERED
+ N
+
+
+ PORT_NUMBER
+ ${db.mysql.epdc.target.port}
+
+
+ PRESERVE_RESERVED_WORD_CASE
+ Y
+
+
+ QUOTE_ALL_FIELDS
+ N
+
+
+ STREAM_RESULTS
+ Y
+
+
+ SUPPORTS_BOOLEAN_DATA_TYPE
+ Y
+
+
+ SUPPORTS_TIMESTAMP_DATA_TYPE
+ Y
+
+
+ USE_POOLING
+ N
+
+
+
+
+
+ 表输入
+ 数据库连接
+ Y
+
+
+ 数据库连接
+ 插入 / 更新
+ Y
+
+
+
+ 插入 / 更新
+ InsertUpdate
+
+ Y
+
+ 1
+
+ none
+
+
+ esua_epdc_analysis
+ 100
+ N
+
+ esua_epdc_analysis
+ meta_epdc_kpi_case_handling
+
+ ID
+ ID
+ =
+
+
+
+ ID
+ ID
+ Y
+
+
+ DEPT_ID
+ DEPT_ID
+ Y
+
+
+ DEPT_NAME
+ DEPT_NAME
+ Y
+
+
+ DEPT_TYPE_KEY
+ DEPT_TYPE_KEY
+ Y
+
+
+ MONTH_YEAR
+ MONTH_YEAR
+ Y
+
+
+ CASE_HANDLING
+ CASE_HANDLING
+ Y
+
+
+ CASE_HANDLING_SCORE
+ CASE_HANDLING_SCORE
+ Y
+
+
+ PARENT_DEPT_IDS
+ PARENT_DEPT_IDS
+ Y
+
+
+ PARENT_DEPT_NAMES
+ PARENT_DEPT_NAMES
+ Y
+
+
+ ALL_DEPT_IDS
+ ALL_DEPT_IDS
+ Y
+
+
+ ALL_DEPT_NAMES
+ ALL_DEPT_NAMES
+ Y
+
+
+ REVISION
+ REVISION
+ Y
+
+
+ CREATED_BY
+ CREATED_BY
+ Y
+
+
+ CREATED_TIME
+ CREATED_TIME
+ Y
+
+
+ UPDATED_BY
+ UPDATED_BY
+ Y
+
+
+ UPDATED_TIME
+ UPDATED_TIME
+ Y
+
+
+ DEL_FLAG
+ DEL_FLAG
+ Y
+
+
+
+
+
+
+
+
+
+
+ 736
+ 256
+ Y
+
+
+
+ 数据库连接
+ DBJoin
+
+ Y
+
+ 1
+
+ none
+
+
+ esua.epdc.kpi
+ 0
+ SELECT * FROM epdc_kpi_case_handling
+ WHERE (UPDATED_TIME > ?
+ AND UPDATED_TIME <= ?) or del_flag=1
+
+ N
+ N
+
+
+ START_TIME
+ Date
+
+
+ END_TIME
+ Date
+
+
+
+
+
+
+
+
+
+
+ 544
+ 256
+ Y
+
+
+
+ 表输入
+ TableInput
+
+ Y
+
+ 1
+
+ none
+
+
+ esua_epdc_analysis
+
+SELECT
+ IFNULL((SELECT UPDATED_TIME FROM meta_epdc_kpi_case_handling ORDER BY UPDATED_TIME DESC LIMIT 1),'2000-01-01 00:00:00') AS START_TIME,
+ END_TIME
+FROM epdc_kettle_job_record
+ ORDER BY CREATED_TIME
+ DESC LIMIT 1;
+ 0
+
+ N
+ N
+ N
+ N
+
+
+ String
+ normal
+ START_TIME
+ 19
+ -1
+ 表输入
+ START_TIME
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Timestamp
+ normal
+ END_TIME
+ 0
+ -1
+ 表输入
+ END_TIME
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+
+
+
+
+
+
+
+
+ 352
+ 256
+ Y
+
+
+
+
+
+
+ N
+
+
diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_people_evaluate.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_people_evaluate.ktr
new file mode 100644
index 000000000..5322525bb
--- /dev/null
+++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_people_evaluate.ktr
@@ -0,0 +1,824 @@
+
+
+
+ epdc_kpi_people_evaluate
+
+
+
+ Normal
+ 0
+ /
+
+
+
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STATUS
+ Y
+ STATUS
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ STARTDATE
+ Y
+ STARTDATE
+
+
+ ENDDATE
+ Y
+ ENDDATE
+
+
+ LOGDATE
+ Y
+ LOGDATE
+
+
+ DEPDATE
+ Y
+ DEPDATE
+
+
+ REPLAYDATE
+ Y
+ REPLAYDATE
+
+
+ LOG_FIELD
+ Y
+ LOG_FIELD
+
+
+ EXECUTING_SERVER
+ N
+ EXECUTING_SERVER
+
+
+ EXECUTING_USER
+ N
+ EXECUTING_USER
+
+
+ CLIENT
+ N
+ CLIENT
+
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ SEQ_NR
+ Y
+ SEQ_NR
+
+
+ LOGDATE
+ Y
+ LOGDATE
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STEPNAME
+ Y
+ STEPNAME
+
+
+ STEP_COPY
+ Y
+ STEP_COPY
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ INPUT_BUFFER_ROWS
+ Y
+ INPUT_BUFFER_ROWS
+
+
+ OUTPUT_BUFFER_ROWS
+ Y
+ OUTPUT_BUFFER_ROWS
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ LOGGING_OBJECT_TYPE
+ Y
+ LOGGING_OBJECT_TYPE
+
+
+ OBJECT_NAME
+ Y
+ OBJECT_NAME
+
+
+ OBJECT_COPY
+ Y
+ OBJECT_COPY
+
+
+ REPOSITORY_DIRECTORY
+ Y
+ REPOSITORY_DIRECTORY
+
+
+ FILENAME
+ Y
+ FILENAME
+
+
+ OBJECT_ID
+ Y
+ OBJECT_ID
+
+
+ OBJECT_REVISION
+ Y
+ OBJECT_REVISION
+
+
+ PARENT_CHANNEL_ID
+ Y
+ PARENT_CHANNEL_ID
+
+
+ ROOT_CHANNEL_ID
+ Y
+ ROOT_CHANNEL_ID
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ TRANSNAME
+ Y
+ TRANSNAME
+
+
+ STEPNAME
+ Y
+ STEPNAME
+
+
+ STEP_COPY
+ Y
+ STEP_COPY
+
+
+ LINES_READ
+ Y
+ LINES_READ
+
+
+ LINES_WRITTEN
+ Y
+ LINES_WRITTEN
+
+
+ LINES_UPDATED
+ Y
+ LINES_UPDATED
+
+
+ LINES_INPUT
+ Y
+ LINES_INPUT
+
+
+ LINES_OUTPUT
+ Y
+ LINES_OUTPUT
+
+
+ LINES_REJECTED
+ Y
+ LINES_REJECTED
+
+
+ ERRORS
+ Y
+ ERRORS
+
+
+ LOG_FIELD
+ N
+ LOG_FIELD
+
+
+
+
+
+
+
+
+ ID_BATCH
+ Y
+ ID_BATCH
+
+
+ CHANNEL_ID
+ Y
+ CHANNEL_ID
+
+
+ LOG_DATE
+ Y
+ LOG_DATE
+
+
+ METRICS_DATE
+ Y
+ METRICS_DATE
+
+
+ METRICS_CODE
+ Y
+ METRICS_CODE
+
+
+ METRICS_DESCRIPTION
+ Y
+ METRICS_DESCRIPTION
+
+
+ METRICS_SUBJECT
+ Y
+ METRICS_SUBJECT
+
+
+ METRICS_TYPE
+ Y
+ METRICS_TYPE
+
+
+ METRICS_VALUE
+ Y
+ METRICS_VALUE
+
+
+
+
+
+
+
+ 0.0
+ 0.0
+
+ 10000
+ 50
+ 50
+ N
+ Y
+ 50000
+ Y
+
+ N
+ 1000
+ 100
+
+
+
+
+
+
+
+
+ -
+ 2020/02/23 18:06:42.514
+ -
+ 2020/02/23 18:06:42.514
+ H4sIAAAAAAAAAAMAAAAAAAAAAAA=
+ N
+
+
+
+
+ esua.epdc.kpi
+ ${db.mysql.epdc.source.host}
+ MYSQL
+ Native
+ ${esua.epdc.kpi.database}
+ ${db.mysql.epdc.source.port}
+ ${db.mysql.epdc.source.username}
+ ${db.mysql.epdc.source.password}
+
+
+
+
+
+ FORCE_IDENTIFIERS_TO_LOWERCASE
+ N
+
+
+ FORCE_IDENTIFIERS_TO_UPPERCASE
+ N
+
+
+ IS_CLUSTERED
+ N
+
+
+ PORT_NUMBER
+ ${db.mysql.epdc.source.port}
+
+
+ PRESERVE_RESERVED_WORD_CASE
+ Y
+
+
+ QUOTE_ALL_FIELDS
+ N
+
+
+ STREAM_RESULTS
+ Y
+
+
+ SUPPORTS_BOOLEAN_DATA_TYPE
+ Y
+
+
+ SUPPORTS_TIMESTAMP_DATA_TYPE
+ Y
+
+
+ USE_POOLING
+ N
+
+
+
+
+ esua_epdc_analysis
+ ${db.mysql.epdc.target.host}
+ MYSQL
+ Native
+ ${esua.epdc.analysis.database}
+ ${db.mysql.epdc.target.port}
+ ${db.mysql.epdc.target.username}
+ ${db.mysql.epdc.target.password}
+
+
+
+
+
+ EXTRA_OPTION_MYSQL.characterEncoding
+ utf8
+
+
+ FORCE_IDENTIFIERS_TO_LOWERCASE
+ N
+
+
+ FORCE_IDENTIFIERS_TO_UPPERCASE
+ N
+
+
+ IS_CLUSTERED
+ N
+
+
+ PORT_NUMBER
+ ${db.mysql.epdc.target.port}
+
+
+ PRESERVE_RESERVED_WORD_CASE
+ Y
+
+
+ QUOTE_ALL_FIELDS
+ N
+
+
+ STREAM_RESULTS
+ Y
+
+
+ SUPPORTS_BOOLEAN_DATA_TYPE
+ Y
+
+
+ SUPPORTS_TIMESTAMP_DATA_TYPE
+ Y
+
+
+ USE_POOLING
+ N
+
+
+
+
+
+ 表输入
+ 数据库连接
+ Y
+
+
+ 数据库连接
+ 插入 / 更新
+ Y
+
+
+
+ 插入 / 更新
+ InsertUpdate
+
+ Y
+
+ 1
+
+ none
+
+
+ esua_epdc_analysis
+ 100
+ N
+
+
+ meta_epdc_kpi_people_evaluate
+
+ ID
+ ID
+ =
+
+
+
+ ID
+ ID
+ Y
+
+
+ DEPT_ID
+ DEPT_ID
+ Y
+
+
+ DEPT_NAME
+ DEPT_NAME
+ Y
+
+
+ DEPT_TYPE_KEY
+ DEPT_TYPE_KEY
+ Y
+
+
+ YEAR
+ YEAR
+ Y
+
+
+ PEOPLE_EVALUATE
+ PEOPLE_EVALUATE
+ Y
+
+
+ PEOPLE_EVALUATE_SCORE
+ PEOPLE_EVALUATE_SCORE
+ Y
+
+
+ PARENT_DEPT_IDS
+ PARENT_DEPT_IDS
+ Y
+
+
+ PARENT_DEPT_NAMES
+ PARENT_DEPT_NAMES
+ Y
+
+
+ ALL_DEPT_IDS
+ ALL_DEPT_IDS
+ Y
+
+
+ ALL_DEPT_NAMES
+ ALL_DEPT_NAMES
+ Y
+
+
+ REVISION
+ REVISION
+ Y
+
+
+ CREATED_BY
+ CREATED_BY
+ Y
+
+
+ CREATED_TIME
+ CREATED_TIME
+ Y
+
+
+ UPDATED_BY
+ UPDATED_BY
+ Y
+
+
+ UPDATED_TIME
+ UPDATED_TIME
+ Y
+
+
+ DEL_FLAG
+ DEL_FLAG
+ Y
+
+
+
+
+
+
+
+
+
+
+ 736
+ 256
+ Y
+
+
+
+ 数据库连接
+ DBJoin
+
+ Y
+
+ 1
+
+ none
+
+
+ esua.epdc.kpi
+ 0
+ SELECT * FROM epdc_kpi_people_evaluate
+ WHERE (UPDATED_TIME > ?
+ AND UPDATED_TIME <= ?) or del_flag=1
+
+ N
+ N
+
+
+ START_TIME
+ Date
+
+
+ END_TIME
+ Date
+
+
+
+
+
+
+
+
+
+
+ 544
+ 256
+ Y
+
+
+
+ 表输入
+ TableInput
+
+ Y
+
+ 1
+
+ none
+
+
+ esua_epdc_analysis
+
+SELECT
+ IFNULL((SELECT UPDATED_TIME FROM meta_epdc_kpi_people_evaluate ORDER BY UPDATED_TIME DESC LIMIT 1),'2000-01-01 00:00:00') AS START_TIME,
+ END_TIME
+FROM epdc_kettle_job_record
+ ORDER BY CREATED_TIME
+ DESC LIMIT 1;
+ 0
+
+ N
+ N
+ N
+ N
+
+
+ String
+ normal
+ START_TIME
+ 19
+ -1
+ 表输入
+ START_TIME
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ String
+ normal
+ END_TIME
+ 19
+ -1
+ 表输入
+ END_TIME
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+
+
+
+
+
+
+
+
+ 352
+ 256
+ Y
+
+
+
+
+
+
+ N
+
+
diff --git a/esua-epdc/kettle-Code/esua_epdc_behavior/epdc_active_user_info.ktr b/esua-epdc/kettle-Code/esua_epdc_behavior/epdc_active_user_info.ktr
index 76eaf6f52..3d06341b1 100644
--- a/esua-epdc/kettle-Code/esua_epdc_behavior/epdc_active_user_info.ktr
+++ b/esua-epdc/kettle-Code/esua_epdc_behavior/epdc_active_user_info.ktr
@@ -811,7 +811,7 @@ select REPLACE(MD5(UUID()), '-', '') as ID,
user.MOBILE,
user.PARTY_FLAG,
beh.MONTH_YEAR AS STATISTICAL_MONTH,
- DATE_FORMAT(DATE_ADD(now(),interval -7 day),'%Y-%m-%d') AS REACH_ACTIVE_TIME,
+ DATE_FORMAT(DATE_ADD(now(),interval -1 day),'%Y-%m-%d') AS REACH_ACTIVE_TIME,
last_day(DATE_SUB(NOW(),INTERVAL 1 DAY)) AS VALID_TIME,
user.ALL_DEPT_IDS,
user.ALL_DEPT_NAMES,
diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_community_month_dept_new.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_community_month_dept_new.ktr
index 79a7a651f..12cc8bb88 100644
--- a/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_community_month_dept_new.ktr
+++ b/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_community_month_dept_new.ktr
@@ -636,26 +636,6 @@
PUBLIC_OPINION_RESPONSE
Y
-
- OVERALL_EVALUATION
- OVERALL_EVALUATION
- Y
-
-
- SATISFIED
- SATISFIED
- Y
-
-
- BASIC_SATISFACTION
- BASIC_SATISFACTION
- Y
-
-
- DISSATISFIED
- DISSATISFIED
- Y
-
ID
ID
@@ -738,10 +718,10 @@
format(3.00,2) as INNOVATION_BREAKTHROUGH,
format(2.00,2) as PUBLIC_OPINION_RESPONSE,
-- 群众评价
- format(20.00,2) as OVERALL_EVALUATION,
- format(0.00,2) as SATISFIED,
- format(0.00,2) as BASIC_SATISFACTION,
- format(0.00,2) as DISSATISFIED,
+ -- format(20.00,2) as OVERALL_EVALUATION,
+ -- format(0.00,2) as SATISFIED,
+ -- format(0.00,2) as BASIC_SATISFACTION,
+ -- format(0.00,2) as DISSATISFIED,
REPLACE(MD5(UUID()), '-', '') as ID,
now() as CREATED_TIME,
'admin' as CREATED_BY,
@@ -882,7 +862,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
COMPOSITE_SCORE
- 47
+ 39
-1
表输入
COMPOSITE_SCORE
@@ -905,7 +885,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
ORGANIZATION_IMPROVEMENT
- 47
+ 39
-1
表输入
ORGANIZATION_IMPROVEMENT
@@ -928,7 +908,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
BASE_PARTY_BUILDING
- 47
+ 39
-1
表输入
BASE_PARTY_BUILDING
@@ -951,7 +931,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
CO_OPERATION_CO_CONSTRUCTION
- 47
+ 39
-1
表输入
CO_OPERATION_CO_CONSTRUCTION
@@ -974,7 +954,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
TYPICAL_CASE
- 47
+ 39
-1
表输入
TYPICAL_CASE
@@ -997,7 +977,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
BLOWING_MATTERS_HANDING
- 47
+ 39
-1
表输入
BLOWING_MATTERS_HANDING
@@ -1020,7 +1000,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
PEOPLE_MATTERS_RESPONSE_RATE
- 47
+ 39
-1
表输入
PEOPLE_MATTERS_RESPONSE_RATE
@@ -1043,7 +1023,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
PEOPLE_MATTERS_SATISFACTION_RATE
- 47
+ 39
-1
表输入
PEOPLE_MATTERS_SATISFACTION_RATE
@@ -1066,7 +1046,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
COMMUNITY_BUILDING
- 49
+ 41
-1
表输入
COMMUNITY_BUILDING
@@ -1089,7 +1069,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
DEMOCRATIC_CONSULTATION_MECHANISM
- 47
+ 39
-1
表输入
DEMOCRATIC_CONSULTATION_MECHANISM
@@ -1112,7 +1092,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
RESIDENT_CONVENTION_SYSTEM
- 47
+ 39
-1
表输入
RESIDENT_CONVENTION_SYSTEM
@@ -1135,7 +1115,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
GRID_NEGOTIATION_CASE
- 47
+ 39
-1
表输入
GRID_NEGOTIATION_CASE
@@ -1158,7 +1138,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
PUBLIC_OPINION
- 49
+ 41
-1
表输入
PUBLIC_OPINION
@@ -1181,7 +1161,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
PUBLICITY_FOUNDATION
- 47
+ 39
-1
表输入
PUBLICITY_FOUNDATION
@@ -1204,7 +1184,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
INNOVATION_BREAKTHROUGH
- 47
+ 39
-1
表输入
INNOVATION_BREAKTHROUGH
@@ -1227,7 +1207,7 @@ where t1.TYPE_KEY = 'community_party'
String
normal
PUBLIC_OPINION_RESPONSE
- 47
+ 39
-1
表输入
PUBLIC_OPINION_RESPONSE
@@ -1246,98 +1226,6 @@ where t1.TYPE_KEY = 'community_party'
Asia/Shanghai
N
-
- String
- normal
- OVERALL_EVALUATION
- 49
- -1
- 表输入
- OVERALL_EVALUATION
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
-
- String
- normal
- SATISFIED
- 47
- -1
- 表输入
- SATISFIED
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
-
- String
- normal
- BASIC_SATISFACTION
- 47
- -1
- 表输入
- BASIC_SATISFACTION
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
-
- String
- normal
- DISSATISFIED
- 47
- -1
- 表输入
- DISSATISFIED
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
String
normal
@@ -1457,7 +1345,7 @@ where t1.TYPE_KEY = 'community_party'
Integer
normal
DEL_FLAG
- 9
+ 15
0
表输入
DEL_FLAG
@@ -1480,7 +1368,7 @@ where t1.TYPE_KEY = 'community_party'
Integer
normal
REVISION
- 9
+ 15
0
表输入
REVISION
diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_grid_month_dept_new.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_grid_month_dept_new.ktr
index 6e8b546df..e7b1889f7 100644
--- a/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_grid_month_dept_new.ktr
+++ b/esua-epdc/kettle-Code/governanceRankingMonth/all_depts/epdc_gr_grid_month_dept_new.ktr
@@ -636,26 +636,6 @@
PUBLIC_OPINION_RESPONSE
Y
-
- OVERALL_EVALUATION
- OVERALL_EVALUATION
- Y
-
-
- SATISFIED
- SATISFIED
- Y
-
-
- BASIC_SATISFACTION
- BASIC_SATISFACTION
- Y
-
-
- DISSATISFIED
- DISSATISFIED
- Y
-
ID
ID
@@ -738,10 +718,10 @@
format(3.00,2) as INNOVATION_BREAKTHROUGH,
format(2.00,2) as PUBLIC_OPINION_RESPONSE,
-- 群众评价
- format(20.00,2) as OVERALL_EVALUATION,
- format(10.00,2) as SATISFIED,
- format(5.00,2) as BASIC_SATISFACTION,
- format(5.00,2) as DISSATISFIED,
+ --format(20.00,2) as OVERALL_EVALUATION,
+ --format(10.00,2) as SATISFIED,
+ -- format(5.00,2) as BASIC_SATISFACTION,
+ -- format(5.00,2) as DISSATISFIED,
REPLACE(MD5(UUID()), '-', '') as ID,
now() as CREATED_TIME,
'admin' as CREATED_BY,
@@ -885,7 +865,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
COMPOSITE_SCORE
- 47
+ 39
-1
表输入
COMPOSITE_SCORE
@@ -908,7 +888,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
ORGANIZATION_IMPROVEMENT
- 47
+ 39
-1
表输入
ORGANIZATION_IMPROVEMENT
@@ -931,7 +911,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
BASE_PARTY_BUILDING
- 47
+ 39
-1
表输入
BASE_PARTY_BUILDING
@@ -954,7 +934,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
CO_OPERATION_CO_CONSTRUCTION
- 47
+ 39
-1
表输入
CO_OPERATION_CO_CONSTRUCTION
@@ -977,7 +957,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
TYPICAL_CASE
- 47
+ 39
-1
表输入
TYPICAL_CASE
@@ -1000,7 +980,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
BLOWING_MATTERS_HANDING
- 47
+ 39
-1
表输入
BLOWING_MATTERS_HANDING
@@ -1023,7 +1003,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
PEOPLE_MATTERS_RESPONSE_RATE
- 47
+ 39
-1
表输入
PEOPLE_MATTERS_RESPONSE_RATE
@@ -1046,7 +1026,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
PEOPLE_MATTERS_SATISFACTION_RATE
- 47
+ 39
-1
表输入
PEOPLE_MATTERS_SATISFACTION_RATE
@@ -1069,7 +1049,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
COMMUNITY_BUILDING
- 49
+ 41
-1
表输入
COMMUNITY_BUILDING
@@ -1092,7 +1072,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
DEMOCRATIC_CONSULTATION_MECHANISM
- 47
+ 39
-1
表输入
DEMOCRATIC_CONSULTATION_MECHANISM
@@ -1115,7 +1095,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
RESIDENT_CONVENTION_SYSTEM
- 47
+ 39
-1
表输入
RESIDENT_CONVENTION_SYSTEM
@@ -1138,7 +1118,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
GRID_NEGOTIATION_CASE
- 47
+ 39
-1
表输入
GRID_NEGOTIATION_CASE
@@ -1161,7 +1141,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
PUBLIC_OPINION
- 49
+ 41
-1
表输入
PUBLIC_OPINION
@@ -1184,7 +1164,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
PUBLICITY_FOUNDATION
- 47
+ 39
-1
表输入
PUBLICITY_FOUNDATION
@@ -1207,7 +1187,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
INNOVATION_BREAKTHROUGH
- 47
+ 39
-1
表输入
INNOVATION_BREAKTHROUGH
@@ -1230,7 +1210,7 @@ where t1.TYPE_KEY = 'grid_party'
String
normal
PUBLIC_OPINION_RESPONSE
- 47
+ 39
-1
表输入
PUBLIC_OPINION_RESPONSE
@@ -1250,14 +1230,14 @@ where t1.TYPE_KEY = 'grid_party'
N
- String
+ Number
normal
OVERALL_EVALUATION
- 49
+ -1
-1
表输入
OVERALL_EVALUATION
-
+ ####0.0#########;-####0.0#########
.
,
@@ -1273,60 +1253,14 @@ where t1.TYPE_KEY = 'grid_party'
N
- String
+ Number
normal
SATISFIED
- 49
+ -1
-1
表输入
SATISFIED
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
-
- String
- normal
- BASIC_SATISFACTION
- 47
- -1
- 表输入
- BASIC_SATISFACTION
-
- .
- ,
-
- none
- N
- Y
- 0
- N
- N
- N
- zh_CN
- Asia/Shanghai
- N
-
-
- String
- normal
- DISSATISFIED
- 47
- -1
- 表输入
- DISSATISFIED
-
+ ####0.0#########;-####0.0#########
.
,
@@ -1460,7 +1394,7 @@ where t1.TYPE_KEY = 'grid_party'
Integer
normal
DEL_FLAG
- 9
+ 15
0
表输入
DEL_FLAG
@@ -1483,7 +1417,7 @@ where t1.TYPE_KEY = 'grid_party'
Integer
normal
REVISION
- 9
+ 15
0
表输入
REVISION
diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr
index ddae23300..75a7100c0 100644
--- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr
+++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr
@@ -520,71 +520,57 @@
ID
-
MONTH_YEAR
-
CASE_HANDLING
-
PEOPLE_MATTERS_RESPONSE_RATE
-
PEOPLE_MATTERS_FINISH_RATE
-
PEOPLE_MATTERS_SATISFACTION_RATE
-
BLOWING_MATTERS_HANDING
-
OVERALL_EVALUATION
-
+
+
+ PEOPLE_EVALUATE
DEPT_ID
-
DEPT_NAME
-
ALL_DEPT_IDS
-
ALL_DEPT_NAMES
-
DEL_FLAG
-
CREATED_BY
-
CREATED_TIME
-
UPDATED_BY
-
UPDATED_TIME
-
N
@@ -809,6 +795,10 @@
OVERALL_EVALUATION
OVERALL_EVALUATION
+
+ PEOPLE_EVALUATE
+ PEOPLE_EVALUATE
+
@@ -847,6 +837,7 @@
FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.CASE_HANDLING_SCORE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2)
BLOWING_MATTERS_HANDING, -- 吹哨事项办理
format(c.PEOPLE_MATTERS_SATISFACTION_RATE+10,2) as OVERALL_EVALUATION,
+ '10.000' as PEOPLE_EVALUATE,
c.DEPT_ID,
c.DEPT_NAME,
c.ALL_DEPT_IDS,
@@ -998,7 +989,7 @@ LEFT JOIN (
String
normal
CASE_HANDLING
- 381
+ 75
-1
表输入
CASE_HANDLING
@@ -1021,7 +1012,7 @@ LEFT JOIN (
String
normal
PEOPLE_MATTERS_RESPONSE_RATE
- 123
+ 115
-1
表输入
PEOPLE_MATTERS_RESPONSE_RATE
@@ -1044,7 +1035,7 @@ LEFT JOIN (
String
normal
PEOPLE_MATTERS_FINISH_RATE
- 123
+ 115
-1
表输入
PEOPLE_MATTERS_FINISH_RATE
@@ -1067,7 +1058,7 @@ LEFT JOIN (
String
normal
PEOPLE_MATTERS_SATISFACTION_RATE
- 126
+ 118
-1
表输入
PEOPLE_MATTERS_SATISFACTION_RATE
@@ -1090,7 +1081,7 @@ LEFT JOIN (
String
normal
BLOWING_MATTERS_HANDING
- 66
+ 58
-1
表输入
BLOWING_MATTERS_HANDING
@@ -1113,7 +1104,7 @@ LEFT JOIN (
String
normal
OVERALL_EVALUATION
- 71
+ 63
-1
表输入
OVERALL_EVALUATION
@@ -1132,6 +1123,29 @@ LEFT JOIN (
Asia/Shanghai
N
+
+ String
+ normal
+ PEOPLE_EVALUATE
+ 6
+ -1
+ 表输入
+ PEOPLE_EVALUATE
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
Integer
normal
diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr
index c40cf9a64..cc5bb98c5 100644
--- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr
+++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr
@@ -588,6 +588,10 @@
OVERALL_EVALUATION
+
+ PEOPLE_EVALUATE
+
+
DEL_FLAG
@@ -831,6 +835,10 @@
OVERALL_EVALUATION
OVERALL_EVALUATION
+
+ PEOPLE_EVALUATE
+ PEOPLE_EVALUATE
+
@@ -873,6 +881,7 @@
FORMAT(ROUND((totalBlowingFraction.PEOPLE_MATTERS_RESPONSE_RATE + totalBlowingFraction.PEOPLE_MATTERS_FINISH_RATE
+ totalBlowingFraction.CASE_HANDLING_SCORE - totalBlowingFraction.DEDUCTION), 2), 2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理
format(totalBlowingFraction.PEOPLE_MATTERS_SATISFACTION_RATE+10,2) as OVERALL_EVALUATION,
+ '10.000' as PEOPLE_EVALUATE,
'0' DEL_FLAG,
'ADMIN_USER' CREATED_BY,
now() CREATED_TIME,
@@ -1121,7 +1130,7 @@ FROM(
String
normal
CASE_HANDLING
- 381
+ 75
-1
表输入
CASE_HANDLING
@@ -1144,7 +1153,7 @@ FROM(
String
normal
PEOPLE_MATTERS_RESPONSE_RATE
- 65
+ 57
-1
表输入
PEOPLE_MATTERS_RESPONSE_RATE
@@ -1167,7 +1176,7 @@ FROM(
String
normal
PEOPLE_MATTERS_FINISH_RATE
- 65
+ 57
-1
表输入
PEOPLE_MATTERS_FINISH_RATE
@@ -1190,7 +1199,7 @@ FROM(
String
normal
PEOPLE_MATTERS_SATISFACTION_RATE
- 67
+ 59
-1
表输入
PEOPLE_MATTERS_SATISFACTION_RATE
@@ -1213,7 +1222,7 @@ FROM(
String
normal
BLOWING_MATTERS_HANDING
- 66
+ 58
-1
表输入
BLOWING_MATTERS_HANDING
@@ -1236,7 +1245,7 @@ FROM(
String
normal
OVERALL_EVALUATION
- 71
+ 63
-1
表输入
OVERALL_EVALUATION
@@ -1255,6 +1264,29 @@ FROM(
Asia/Shanghai
N
+
+ String
+ normal
+ PEOPLE_EVALUATE
+ 6
+ -1
+ 表输入
+ PEOPLE_EVALUATE
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
String
normal
diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb
index 00121c496..da0a63ad1 100644
--- a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb
+++ b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb
@@ -353,8 +353,8 @@
Y
N
- N
- 0
+ Y
+ 2
0
60
3