From 6024333e78181cfd492d61a0bf32fcd18d758a58 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 25 Mar 2022 15:18:58 +0800
Subject: [PATCH 1/2] kettle month

---
 .../dcp_job/group_point/group_points.kjb      |  47 ---
 .../epdc_gr_grid_month_new.ktr                |   0
 .../group_point_month/group_point_month.kjb   | 364 ++++++++++++++++++
 3 files changed, 364 insertions(+), 47 deletions(-)
 rename esua-epdc/kettle-Code/dcp_job/{group_point => group_point_month}/epdc_gr_grid_month_new.ktr (100%)
 create mode 100644 esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb

diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb b/esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb
index 038254813..cc43fefef 100644
--- a/esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb
+++ b/esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb
@@ -536,44 +536,6 @@
       <yloc>768</yloc>
       <attributes_kjc/>
     </entry>
-    <entry>
-      <name>epdc_gr_grid_month_new</name>
-      <description/>
-      <type>TRANS</type>
-      <attributes/>
-      <specification_method>filename</specification_method>
-      <trans_object_id/>
-      <filename>${Internal.Entry.Current.Directory}/epdc_gr_grid_month_new.ktr</filename>
-      <transname/>
-      <arg_from_previous>N</arg_from_previous>
-      <params_from_previous>N</params_from_previous>
-      <exec_per_row>N</exec_per_row>
-      <clear_rows>N</clear_rows>
-      <clear_files>N</clear_files>
-      <set_logfile>N</set_logfile>
-      <logfile/>
-      <logext/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <loglevel>Basic</loglevel>
-      <cluster>N</cluster>
-      <slave_server_name/>
-      <set_append_logfile>N</set_append_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <follow_abort_remote>N</follow_abort_remote>
-      <create_parent_folder>N</create_parent_folder>
-      <logging_remote_work>N</logging_remote_work>
-      <run_configuration>Pentaho local</run_configuration>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>656</xloc>
-      <yloc>896</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>user_point_total</name>
       <description/>
@@ -668,15 +630,6 @@
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
-    <hop>
-      <from>Start</from>
-      <to>epdc_gr_grid_month_new</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
     <hop>
       <from>Start</from>
       <to>user_point_total</to>
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/epdc_gr_grid_month_new.ktr b/esua-epdc/kettle-Code/dcp_job/group_point_month/epdc_gr_grid_month_new.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/epdc_gr_grid_month_new.ktr
rename to esua-epdc/kettle-Code/dcp_job/group_point_month/epdc_gr_grid_month_new.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb b/esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb
new file mode 100644
index 000000000..f4da2137c
--- /dev/null
+++ b/esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<job>
+  <name>group_point_month</name>
+  <description/>
+  <extended_description/>
+  <job_version/>
+  <directory>/</directory>
+  <created_user>-</created_user>
+  <created_date>2022/03/25 15:00:26.547</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2022/03/25 15:00:26.547</modified_date>
+  <parameters>
+    </parameters>
+  <slaveservers>
+    </slaveservers>
+  <job-log-table>
+    <connection/>
+    <schema/>
+    <table/>
+    <size_limit_lines/>
+    <interval/>
+    <timeout_days/>
+    <field>
+      <id>ID_JOB</id>
+      <enabled>Y</enabled>
+      <name>ID_JOB</name>
+    </field>
+    <field>
+      <id>CHANNEL_ID</id>
+      <enabled>Y</enabled>
+      <name>CHANNEL_ID</name>
+    </field>
+    <field>
+      <id>JOBNAME</id>
+      <enabled>Y</enabled>
+      <name>JOBNAME</name>
+    </field>
+    <field>
+      <id>STATUS</id>
+      <enabled>Y</enabled>
+      <name>STATUS</name>
+    </field>
+    <field>
+      <id>LINES_READ</id>
+      <enabled>Y</enabled>
+      <name>LINES_READ</name>
+    </field>
+    <field>
+      <id>LINES_WRITTEN</id>
+      <enabled>Y</enabled>
+      <name>LINES_WRITTEN</name>
+    </field>
+    <field>
+      <id>LINES_UPDATED</id>
+      <enabled>Y</enabled>
+      <name>LINES_UPDATED</name>
+    </field>
+    <field>
+      <id>LINES_INPUT</id>
+      <enabled>Y</enabled>
+      <name>LINES_INPUT</name>
+    </field>
+    <field>
+      <id>LINES_OUTPUT</id>
+      <enabled>Y</enabled>
+      <name>LINES_OUTPUT</name>
+    </field>
+    <field>
+      <id>LINES_REJECTED</id>
+      <enabled>Y</enabled>
+      <name>LINES_REJECTED</name>
+    </field>
+    <field>
+      <id>ERRORS</id>
+      <enabled>Y</enabled>
+      <name>ERRORS</name>
+    </field>
+    <field>
+      <id>STARTDATE</id>
+      <enabled>Y</enabled>
+      <name>STARTDATE</name>
+    </field>
+    <field>
+      <id>ENDDATE</id>
+      <enabled>Y</enabled>
+      <name>ENDDATE</name>
+    </field>
+    <field>
+      <id>LOGDATE</id>
+      <enabled>Y</enabled>
+      <name>LOGDATE</name>
+    </field>
+    <field>
+      <id>DEPDATE</id>
+      <enabled>Y</enabled>
+      <name>DEPDATE</name>
+    </field>
+    <field>
+      <id>REPLAYDATE</id>
+      <enabled>Y</enabled>
+      <name>REPLAYDATE</name>
+    </field>
+    <field>
+      <id>LOG_FIELD</id>
+      <enabled>Y</enabled>
+      <name>LOG_FIELD</name>
+    </field>
+    <field>
+      <id>EXECUTING_SERVER</id>
+      <enabled>N</enabled>
+      <name>EXECUTING_SERVER</name>
+    </field>
+    <field>
+      <id>EXECUTING_USER</id>
+      <enabled>N</enabled>
+      <name>EXECUTING_USER</name>
+    </field>
+    <field>
+      <id>START_JOB_ENTRY</id>
+      <enabled>N</enabled>
+      <name>START_JOB_ENTRY</name>
+    </field>
+    <field>
+      <id>CLIENT</id>
+      <enabled>N</enabled>
+      <name>CLIENT</name>
+    </field>
+  </job-log-table>
+  <jobentry-log-table>
+    <connection/>
+    <schema/>
+    <table/>
+    <timeout_days/>
+    <field>
+      <id>ID_BATCH</id>
+      <enabled>Y</enabled>
+      <name>ID_BATCH</name>
+    </field>
+    <field>
+      <id>CHANNEL_ID</id>
+      <enabled>Y</enabled>
+      <name>CHANNEL_ID</name>
+    </field>
+    <field>
+      <id>LOG_DATE</id>
+      <enabled>Y</enabled>
+      <name>LOG_DATE</name>
+    </field>
+    <field>
+      <id>JOBNAME</id>
+      <enabled>Y</enabled>
+      <name>TRANSNAME</name>
+    </field>
+    <field>
+      <id>JOBENTRYNAME</id>
+      <enabled>Y</enabled>
+      <name>STEPNAME</name>
+    </field>
+    <field>
+      <id>LINES_READ</id>
+      <enabled>Y</enabled>
+      <name>LINES_READ</name>
+    </field>
+    <field>
+      <id>LINES_WRITTEN</id>
+      <enabled>Y</enabled>
+      <name>LINES_WRITTEN</name>
+    </field>
+    <field>
+      <id>LINES_UPDATED</id>
+      <enabled>Y</enabled>
+      <name>LINES_UPDATED</name>
+    </field>
+    <field>
+      <id>LINES_INPUT</id>
+      <enabled>Y</enabled>
+      <name>LINES_INPUT</name>
+    </field>
+    <field>
+      <id>LINES_OUTPUT</id>
+      <enabled>Y</enabled>
+      <name>LINES_OUTPUT</name>
+    </field>
+    <field>
+      <id>LINES_REJECTED</id>
+      <enabled>Y</enabled>
+      <name>LINES_REJECTED</name>
+    </field>
+    <field>
+      <id>ERRORS</id>
+      <enabled>Y</enabled>
+      <name>ERRORS</name>
+    </field>
+    <field>
+      <id>RESULT</id>
+      <enabled>Y</enabled>
+      <name>RESULT</name>
+    </field>
+    <field>
+      <id>NR_RESULT_ROWS</id>
+      <enabled>Y</enabled>
+      <name>NR_RESULT_ROWS</name>
+    </field>
+    <field>
+      <id>NR_RESULT_FILES</id>
+      <enabled>Y</enabled>
+      <name>NR_RESULT_FILES</name>
+    </field>
+    <field>
+      <id>LOG_FIELD</id>
+      <enabled>N</enabled>
+      <name>LOG_FIELD</name>
+    </field>
+    <field>
+      <id>COPY_NR</id>
+      <enabled>N</enabled>
+      <name>COPY_NR</name>
+    </field>
+  </jobentry-log-table>
+  <channel-log-table>
+    <connection/>
+    <schema/>
+    <table/>
+    <timeout_days/>
+    <field>
+      <id>ID_BATCH</id>
+      <enabled>Y</enabled>
+      <name>ID_BATCH</name>
+    </field>
+    <field>
+      <id>CHANNEL_ID</id>
+      <enabled>Y</enabled>
+      <name>CHANNEL_ID</name>
+    </field>
+    <field>
+      <id>LOG_DATE</id>
+      <enabled>Y</enabled>
+      <name>LOG_DATE</name>
+    </field>
+    <field>
+      <id>LOGGING_OBJECT_TYPE</id>
+      <enabled>Y</enabled>
+      <name>LOGGING_OBJECT_TYPE</name>
+    </field>
+    <field>
+      <id>OBJECT_NAME</id>
+      <enabled>Y</enabled>
+      <name>OBJECT_NAME</name>
+    </field>
+    <field>
+      <id>OBJECT_COPY</id>
+      <enabled>Y</enabled>
+      <name>OBJECT_COPY</name>
+    </field>
+    <field>
+      <id>REPOSITORY_DIRECTORY</id>
+      <enabled>Y</enabled>
+      <name>REPOSITORY_DIRECTORY</name>
+    </field>
+    <field>
+      <id>FILENAME</id>
+      <enabled>Y</enabled>
+      <name>FILENAME</name>
+    </field>
+    <field>
+      <id>OBJECT_ID</id>
+      <enabled>Y</enabled>
+      <name>OBJECT_ID</name>
+    </field>
+    <field>
+      <id>OBJECT_REVISION</id>
+      <enabled>Y</enabled>
+      <name>OBJECT_REVISION</name>
+    </field>
+    <field>
+      <id>PARENT_CHANNEL_ID</id>
+      <enabled>Y</enabled>
+      <name>PARENT_CHANNEL_ID</name>
+    </field>
+    <field>
+      <id>ROOT_CHANNEL_ID</id>
+      <enabled>Y</enabled>
+      <name>ROOT_CHANNEL_ID</name>
+    </field>
+  </channel-log-table>
+  <pass_batchid>N</pass_batchid>
+  <shared_objects_file/>
+  <entries>
+    <entry>
+      <name>Start</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <start>Y</start>
+      <dummy>N</dummy>
+      <repeat>Y</repeat>
+      <schedulerType>4</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>1</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>288</xloc>
+      <yloc>336</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>epdc_gr_grid_month_new</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/epdc_gr_grid_month_new.ktr</filename>
+      <transname/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <clear_rows>N</clear_rows>
+      <clear_files>N</clear_files>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Basic</loglevel>
+      <cluster>N</cluster>
+      <slave_server_name/>
+      <set_append_logfile>N</set_append_logfile>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <create_parent_folder>N</create_parent_folder>
+      <logging_remote_work>N</logging_remote_work>
+      <run_configuration>Pentaho local</run_configuration>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>592</xloc>
+      <yloc>336</yloc>
+      <attributes_kjc/>
+    </entry>
+  </entries>
+  <hops>
+    <hop>
+      <from>Start</from>
+      <to>epdc_gr_grid_month_new</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+  </hops>
+  <notepads>
+  </notepads>
+  <attributes/>
+</job>

From 885554f7f589f503d60007e10dc998218bd2e7ab Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 25 Mar 2022 15:39:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?kettle-Code=E6=96=87=E4=BB=B6=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{dcp_job/dcp_job.kjb => dcp_job_day/dcp_job_day.kjb}        | 0
 .../epmet_gov_issue/epmet_gov_issue.kjb                         | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_issue/issue.ktr          | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_issue/issue_category.ktr | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_issue/issue_process.ktr  | 0
 .../epmet_gov_issue/issue_project_category_dict.ktr             | 0
 .../epmet_gov_issue/issue_project_relation.ktr                  | 0
 .../epmet_gov_issue/issue_vote_detail.ktr                       | 0
 .../epmet_gov_issue/issue_vote_statistical.ktr                  | 0
 .../epmet_gov_project/epmet_gov_project.kjb                     | 0
 .../epmet_gov_project/get_project_count.ktr                     | 0
 .../epmet_gov_project/get_project_process_count.ktr             | 0
 .../epmet_gov_project/get_resi_event_count.ktr                  | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_project/project.ktr      | 0
 .../epmet_gov_project/project_category.ktr                      | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_project/project_loop.kjb | 0
 .../epmet_gov_project/project_process.ktr                       | 0
 .../epmet_gov_project/project_process_attachment.ktr            | 0
 .../epmet_gov_project/project_process_loop.kjb                  | 0
 .../epmet_gov_project/project_related_personnel.ktr             | 0
 .../epmet_gov_project/project_staff.ktr                         | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_project/resi_event.ktr   | 0
 .../epmet_gov_project/resi_event_loop.kjb                       | 0
 .../epmet_gov_project/resi_event_reply.ktr                      | 0
 .../{dcp_job => dcp_job_day}/epmet_gov_project/setValue.ktr     | 0
 .../epmet_gov_project/setValue_event.ktr                        | 0
 .../epmet_gov_project/setValue_project.ktr                      | 0
 .../{dcp_job => dcp_job_day}/group_point/group_points.kjb       | 0
 .../{dcp_job => dcp_job_day}/group_point/resi_group.ktr         | 0
 .../{dcp_job => dcp_job_day}/group_point/resi_group_member.ktr  | 0
 .../{dcp_job => dcp_job_day}/group_point/resi_topic.ktr         | 0
 .../group_point/resi_topic_attachment.ktr                       | 0
 .../{dcp_job => dcp_job_day}/group_point/resi_topic_comment.ktr | 0
 .../group_point/user_point_action_log.ktr                       | 0
 .../{dcp_job => dcp_job_day}/group_point/user_point_total.ktr   | 0
 .../{dcp_job => dcp_job_day}/user/register_relation.ktr         | 0
 esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/user.kjb    | 0
 .../{dcp_job => dcp_job_day}/user/user_base_info.ktr            | 0
 .../{dcp_job => dcp_job_day}/user/user_resi_info.ktr            | 0
 .../kettle-Code/{dcp_job => dcp_job_day}/user/user_role.ktr     | 0
 esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/userjob.ktr | 0
 .../{dcp_job => dcp_job_day}/user/volunteer_info.ktr            | 0
 .../group_point_month => dcp_job_month}/group_point_month.kjb   | 2 +-
 .../group_point_month/epdc_gr_grid_month_new.ktr                | 0
 44 files changed, 1 insertion(+), 1 deletion(-)
 rename esua-epdc/kettle-Code/{dcp_job/dcp_job.kjb => dcp_job_day/dcp_job_day.kjb} (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/epmet_gov_issue.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_category.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_process.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_project_category_dict.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_project_relation.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_vote_detail.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_issue/issue_vote_statistical.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/epmet_gov_project.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/get_project_count.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/get_project_process_count.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/get_resi_event_count.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_category.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_loop.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_process.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_process_attachment.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_process_loop.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_related_personnel.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/project_staff.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/resi_event.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/resi_event_loop.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/resi_event_reply.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/setValue.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/setValue_event.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/epmet_gov_project/setValue_project.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/group_points.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/resi_group.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/resi_group_member.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/resi_topic.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/resi_topic_attachment.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/resi_topic_comment.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/user_point_action_log.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/group_point/user_point_total.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/register_relation.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/user.kjb (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/user_base_info.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/user_resi_info.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/user_role.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/userjob.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_day}/user/volunteer_info.ktr (100%)
 rename esua-epdc/kettle-Code/{dcp_job/group_point_month => dcp_job_month}/group_point_month.kjb (98%)
 rename esua-epdc/kettle-Code/{dcp_job => dcp_job_month}/group_point_month/epdc_gr_grid_month_new.ktr (100%)

diff --git a/esua-epdc/kettle-Code/dcp_job/dcp_job.kjb b/esua-epdc/kettle-Code/dcp_job_day/dcp_job_day.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/dcp_job.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/dcp_job_day.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/epmet_gov_issue.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/epmet_gov_issue.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/epmet_gov_issue.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_category.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_category.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_category.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_category.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_process.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_process.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_process.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_process.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_project_category_dict.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_category_dict.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_project_category_dict.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_relation.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_project_relation.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_project_relation.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_project_relation.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_vote_detail.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_vote_detail.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_vote_detail.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_vote_detail.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_vote_statistical.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_vote_statistical.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue_vote_statistical.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_issue/issue_vote_statistical.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/epmet_gov_project.kjb b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/epmet_gov_project.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/epmet_gov_project.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/epmet_gov_project.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_project_count.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_project_count.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_project_count.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_project_count.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_project_process_count.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_project_process_count.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_project_process_count.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_project_process_count.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_resi_event_count.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_resi_event_count.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/get_resi_event_count.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/get_resi_event_count.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_category.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_category.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_category.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_category.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_loop.kjb b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_loop.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_loop.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_loop.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process_attachment.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process_attachment.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process_attachment.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process_attachment.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process_loop.kjb b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process_loop.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_process_loop.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_process_loop.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_related_personnel.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_related_personnel.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_related_personnel.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_related_personnel.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_staff.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_staff.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/project_staff.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/project_staff.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event_loop.kjb b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event_loop.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event_loop.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event_loop.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event_reply.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event_reply.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/resi_event_reply.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/resi_event_reply.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue_event.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue_event.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue_event.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue_event.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue_project.ktr b/esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue_project.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/epmet_gov_project/setValue_project.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/epmet_gov_project/setValue_project.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb b/esua-epdc/kettle-Code/dcp_job_day/group_point/group_points.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/group_points.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/group_points.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/resi_group.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/resi_group.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/resi_group.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/resi_group.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/resi_group_member.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/resi_group_member.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/resi_group_member.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/resi_group_member.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/resi_topic.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/resi_topic.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/resi_topic_attachment.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic_attachment.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/resi_topic_attachment.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic_attachment.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/resi_topic_comment.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic_comment.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/resi_topic_comment.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/resi_topic_comment.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/user_point_action_log.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/user_point_action_log.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/user_point_action_log.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/user_point_action_log.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point/user_point_total.ktr b/esua-epdc/kettle-Code/dcp_job_day/group_point/user_point_total.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point/user_point_total.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/group_point/user_point_total.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/register_relation.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/register_relation.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/register_relation.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/register_relation.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/user.kjb b/esua-epdc/kettle-Code/dcp_job_day/user/user.kjb
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/user.kjb
rename to esua-epdc/kettle-Code/dcp_job_day/user/user.kjb
diff --git a/esua-epdc/kettle-Code/dcp_job/user/user_base_info.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/user_base_info.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/user_base_info.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/user_base_info.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/user_resi_info.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/user_resi_info.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/user_resi_info.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/user_resi_info.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/user_role.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/user_role.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/user_role.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/user_role.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/userjob.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/userjob.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/userjob.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/userjob.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr b/esua-epdc/kettle-Code/dcp_job_day/user/volunteer_info.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr
rename to esua-epdc/kettle-Code/dcp_job_day/user/volunteer_info.ktr
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb b/esua-epdc/kettle-Code/dcp_job_month/group_point_month.kjb
similarity index 98%
rename from esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb
rename to esua-epdc/kettle-Code/dcp_job_month/group_point_month.kjb
index f4da2137c..651fd4a07 100644
--- a/esua-epdc/kettle-Code/dcp_job/group_point_month/group_point_month.kjb
+++ b/esua-epdc/kettle-Code/dcp_job_month/group_point_month.kjb
@@ -315,7 +315,7 @@
       <attributes/>
       <specification_method>filename</specification_method>
       <trans_object_id/>
-      <filename>${Internal.Entry.Current.Directory}/epdc_gr_grid_month_new.ktr</filename>
+      <filename>${Internal.Entry.Current.Directory}/group_point_month/epdc_gr_grid_month_new.ktr</filename>
       <transname/>
       <arg_from_previous>N</arg_from_previous>
       <params_from_previous>N</params_from_previous>
diff --git a/esua-epdc/kettle-Code/dcp_job/group_point_month/epdc_gr_grid_month_new.ktr b/esua-epdc/kettle-Code/dcp_job_month/group_point_month/epdc_gr_grid_month_new.ktr
similarity index 100%
rename from esua-epdc/kettle-Code/dcp_job/group_point_month/epdc_gr_grid_month_new.ktr
rename to esua-epdc/kettle-Code/dcp_job_month/group_point_month/epdc_gr_grid_month_new.ktr