diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr
index 8600c4a..4559b6d 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr
@@ -616,7 +616,7 @@ FROM
epdc_volunteer_info
WHERE
DEL_FLAG = '0'
-AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')
+AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
0
N
@@ -680,7 +680,7 @@ FROM
epdc_act_info
WHERE
DEL_FLAG = '0'
-AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')
+AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
0
N
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
index 094a1ef..2642df0 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
@@ -898,7 +898,7 @@ true;
N
Y
0
- 256
+ 448
128
@@ -936,7 +936,7 @@ true;
N
Y
0
- 448
+ 640
128
@@ -978,6 +978,44 @@ true;
464
+
+ 清空公益互助表
+
+ TRANS
+
+ filename
+
+ ${Internal.Entry.Current.Directory}/yushan_month_delete.ktr
+
+ N
+ N
+ N
+ N
+ N
+ N
+
+
+ N
+ N
+ Basic
+ N
+
+ N
+ Y
+ N
+ N
+ N
+ Pentaho local
+
+ Y
+
+ N
+ Y
+ 0
+ 272
+ 128
+
+
@@ -1180,7 +1218,7 @@ true;
Start
- 获取公益互助变量
+ 网格下标
0
0
Y
@@ -1189,7 +1227,7 @@ true;
Start
- 网格下标
+ 社区下标
0
0
Y
@@ -1198,16 +1236,25 @@ true;
Start
- 社区下标
+ 清空相关表
0
0
Y
Y
Y
+
+ 清空相关表
+ 街道下标
+ 0
+ 0
+ Y
+ Y
+ N
+
Start
- 清空相关表
+ 清空公益互助表
0
0
Y
@@ -1215,8 +1262,8 @@ true;
Y
- 清空相关表
- 街道下标
+ 清空公益互助表
+ 获取公益互助变量
0
0
Y
@@ -1230,8 +1277,8 @@ true;
后改为按天执行，只是文件名未变更。
62
408
- 214
- 42
+ 265
+ 50
Microsoft YaHei UI
9
N
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete.ktr
new file mode 100644
index 0000000..e6ae605
--- /dev/null
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete.ktr
@@ -0,0 +1,564 @@
+
+
+
+ yushan_month_delete
+
+
+
+ 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/04/27 09:32:01.126
+ -
+ 2020/04/27 09:32:01.126
+ H4sIAAAAAAAAAAMAAAAAAAAAAAA=
+ N
+
+
+
+
+ target_yushan
+ ${db.mysql.epdc.target.ys.host}
+ MYSQL
+ Native
+ ${db.mysql.target.schema.yushandb}
+ ${db.mysql.epdc.target.ys.port}
+ ${db.mysql.epdc.target.ys.username}
+ ${db.mysql.epdc.target.ys.password}
+
+
+
+
+
+ EXTRA_OPTION_MYSQL.allowMultiQueries
+ true
+
+
+ EXTRA_OPTION_MYSQL.characterEncoding
+ utf8
+
+
+ EXTRA_OPTION_MYSQL.serverTimezone
+ Asia/Shanghai
+
+
+ EXTRA_OPTION_MYSQL.useSSL
+ false
+
+
+ EXTRA_OPTION_MYSQL.useUnicode
+ true
+
+
+ FORCE_IDENTIFIERS_TO_LOWERCASE
+ N
+
+
+ FORCE_IDENTIFIERS_TO_UPPERCASE
+ N
+
+
+ IS_CLUSTERED
+ N
+
+
+ PORT_NUMBER
+ ${db.mysql.epdc.target.ys.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
+
+
+
+
+
+
+ 清空公益互助表
+ ExecSQL
+
+ Y
+
+ 1
+
+ none
+
+
+ target_yushan
+ N
+ N
+ Y
+ N
+ DELETE
+FROM
+ ys_charity_overview
+WHERE
+ cal_date = DATE_FORMAT(CURDATE(), '%Y-%m')
+ N
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 608
+ 208
+ Y
+
+
+
+
+
+
+ N
+
+