diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/esua_analysis_synchronize.kjb b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/esua_analysis_synchronize.kjb
index ab3e458c2..7d49a4b8f 100644
--- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/esua_analysis_synchronize.kjb
+++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/esua_analysis_synchronize.kjb
@@ -2243,10 +2243,86 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>784</xloc>
+      <xloc>768</xloc>
       <yloc>5952</yloc>
       <attributes_kjc/>
     </entry>
+    <entry>
+      <name>epdc_kpi_case_handling</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/epdc_kpi_case_handling.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>768</xloc>
+      <yloc>6080</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>epdc_kpi_people_evaluate</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/epdc_kpi_people_evaluate.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>768</xloc>
+      <yloc>6192</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
@@ -2708,6 +2784,24 @@
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
+    <hop>
+      <from>Start</from>
+      <to>epdc_kpi_case_handling</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>epdc_kpi_people_evaluate</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic_user.ktr b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic_user.ktr
index adbf6ffcf..77d71ba12 100644
--- a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic_user.ktr
+++ b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic_user.ktr
@@ -674,257 +674,257 @@
       <schema_name/>
     </partitioning>
     <connection>epdc_analysis_source</connection>
-    <sql>SELECT 	REPLACE(MD5(UUID()),'-','') AS ID,
-				meu.PARTY_FLAG AS PART_FLAG,
-				meu.ALL_DEPT_IDS,
-				total.*
-	from
-	(select  
-				total_flag.USER_ID,
-				IF(SUM(total_flag.VOICE_LIKE_FLAG)>0,1,0) AS VOICE_LIKE_FLAG,
-				IF(SUM(total_flag.VOICE_OPPOSE_FLAG)>0,1,0) AS VOICE_OPPOSE_FLAG,
-				IF(SUM(total_flag.EVENT_PUBLISH_FLAG)>0,1,0) AS EVENT_PUBLISH_FLAG,
-				IF(SUM(total_flag.EVENT_LIKE_FLAG)>0,1,0) AS EVENT_LIKE_FLAG,
-				IF(SUM(total_flag.EVENT_OPPOSE_FLAG)>0,1,0) AS EVENT_OPPOSE_FLAG,
-				IF(SUM(total_flag.EVENT_COMMENT_FLAG)>0,1,0) AS EVENT_COMMENT_FLAG,
-				IF(SUM(total_flag.EVENT_EVALUATE_FLAG)>0,1,0) AS EVENT_EVALUATE_FLAG,
-				IF(SUM(total_flag.GROUP_PUBLISH_FLAG)>0,1,0) AS GROUP_PUBLISH_FLAG,
-				IF(SUM(total_flag.GROUP_LIKE_FLAG)>0,1,0) AS GROUP_LIKE_FLAG,
-				IF(SUM(total_flag.GROUP_OPPOSE_FLAG)>0,1,0) AS GROUP_OPPOSE_FLAG,
-				IF(SUM(total_flag.GROUP_COMMENT_FLAG)>0,1,0) AS GROUP_COMMENT_FLAG,
-				IF(SUM(total_flag.GROUP_JOIN_FLAG)>0,1,0) AS GROUP_JOIN_FLAG,
-				IF(SUM(total_flag.GROUP_CREATE_FLAG)>0,1,0) AS GROUP_CREATE_FLAG,
-				IF(SUM(total_flag.OPEN_FLAG)>=4,1,0) AS OPEN_FLAG,
-				total_flag.CREATED_TIME,now() UPDATED_TIME
-	from (
-			select  enu.USER_ID,
-					COUNT(ATTITUDE_FLAG=0 OR NULL) AS VOICE_LIKE_FLAG,
-					COUNT(ATTITUDE_FLAG=1 OR NULL) AS VOICE_OPPOSE_FLAG,
-					0 AS EVENT_PUBLISH_FLAG,
-					0 AS EVENT_LIKE_FLAG,
-					0 AS EVENT_OPPOSE_FLAG,
-					0 AS EVENT_COMMENT_FLAG,
-					0 AS EVENT_EVALUATE_FLAG,
-					0 AS GROUP_PUBLISH_FLAG,
-					0 AS GROUP_LIKE_FLAG,
-					0 AS GROUP_OPPOSE_FLAG,
-					0 AS GROUP_COMMENT_FLAG,
-				  0 AS GROUP_JOIN_FLAG,
-					0 AS GROUP_CREATE_FLAG,
-					0 AS OPEN_FLAG,
-					date_format(enu.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-			from meta_epdc_news_user_attitude enu
-			WHERE enu.DEL_FLAG=0 
-			AND enu.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-			group by enu.USER_ID,date_format(enu.CREATED_TIME,'%Y-%m-%d')
-		UNION ALL
-			select 	mei.USER_ID,
-					0 AS VOICE_LIKE_FLAG,
-					0 AS VOICE_OPPOSE_FLAG,
-					COUNT(ID) AS EVENT_PUBLISH_FLAG,
-					0 AS EVENT_LIKE_FLAG,
-					0 AS EVENT_OPPOSE_FLAG,
-					0 AS EVENT_COMMENT_FLAG,
-					0 AS EVENT_EVALUATE_FLAG,
-					0 AS GROUP_PUBLISH_FLAG,
-					0 AS GROUP_LIKE_FLAG,
-					0 AS GROUP_OPPOSE_FLAG,
-					0 AS GROUP_COMMENT_FLAG,
-				  0 AS GROUP_JOIN_FLAG,
-					0 AS GROUP_CREATE_FLAG,
-					0 AS OPEN_FLAG,
-				date_format(mei.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-			from meta_epdc_events mei
-			WHERE mei.DEL_FLAG=0 
-			AND mei.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-			group by mei.USER_ID,date_format(mei.CREATED_TIME,'%Y-%m-%d')
-		UNION ALL
-			select  attitude_total_flag.USER_ID,
-							0 AS VOICE_LIKE_FLAG,
-							0 AS VOICE_OPPOSE_FLAG,
-							0 AS EVENT_PUBLISH_FLAG,
-							SUM(attitude_total_flag.EVENT_LIKE_FLAG) AS EVENT_LIKE_FLAG,
-							SUM(attitude_total_flag.EVENT_OPPOSE_FLAG) AS EVENT_OPPOSE_FLAG,
-							0 AS EVENT_COMMENT_FLAG,
-							0 AS EVENT_EVALUATE_FLAG,
-							0 AS GROUP_PUBLISH_FLAG,
-							0 AS GROUP_LIKE_FLAG,
-							0 AS GROUP_OPPOSE_FLAG,
-							0 AS GROUP_COMMENT_FLAG,
-							0 AS GROUP_JOIN_FLAG,
-							0 AS GROUP_CREATE_FLAG,
-							0 AS OPEN_FLAG,
-							attitude_total_flag.CREATED_TIME
-			from (select  USER_ID,
-							COUNT(cua.ATTITUDE_FLAG=0 OR NULL) AS EVENT_LIKE_FLAG,
-							COUNT(cua.ATTITUDE_FLAG=1 OR NULL) AS EVENT_OPPOSE_FLAG,
-							date_format(cua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-					from meta_epdc_event_comment_user_attitude cua
-					where cua.DEL_FLAG=0 
-					AND cua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-					group by USER_ID,date_format(cua.CREATED_TIME,'%Y-%m-%d')
-				UNION all
-					select  USER_ID,
-							COUNT(eua.ATTITUDE_FLAG=0 OR NULL) AS EVENT_LIKE_FLAG,
-							COUNT(eua.ATTITUDE_FLAG=1 OR NULL) AS EVENT_OPPOSE_FLAG,
-							date_format(eua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-					from  meta_epdc_event_user_attitude eua
-					WHERE eua.DEL_FLAG=0 
-					AND eua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-					group by USER_ID,date_format(eua.CREATED_TIME,'%Y-%m-%d')
-					)attitude_total_flag
-				group by attitude_total_flag.USER_ID,attitude_total_flag.CREATED_TIME
-			UNION ALL
-					select  eec.USER_ID,
-					0 AS VOICE_LIKE_FLAG,
-					0 AS VOICE_OPPOSE_FLAG,
-					0 AS EVENT_PUBLISH_FLAG,
-					0 AS EVENT_LIKE_FLAG,
-					0 AS EVENT_OPPOSE_FLAG,
-					COUNT(eec.id) AS EVENT_COMMENT_FLAG,
-					0 AS EVENT_EVALUATE_FLAG,
-					0 AS GROUP_PUBLISH_FLAG,
-					0 AS GROUP_LIKE_FLAG,
-					0 AS GROUP_OPPOSE_FLAG,
-					0 AS GROUP_COMMENT_FLAG,
-				  0 AS GROUP_JOIN_FLAG,
-					0 AS GROUP_CREATE_FLAG,
-					0 AS OPEN_FLAG,
-					date_format(eec.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_event_comment eec
-				WHERE eec.DEL_FLAG=0 
-				AND eec.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				group by eec.USER_ID,date_format(eec.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select  ei.USER_ID,
-					0 AS VOICE_LIKE_FLAG,
-					0 AS VOICE_OPPOSE_FLAG,
-					0 AS EVENT_PUBLISH_FLAG,
-					0 AS EVENT_LIKE_FLAG,
-					0 AS EVENT_OPPOSE_FLAG,
-					0 AS EVENT_COMMENT_FLAG,
-					COUNT(ei.EVALUATION_SCORE is NOT NULL OR NULL) AS EVENT_EVALUATE_FLAG,
-					0 AS GROUP_PUBLISH_FLAG,
-					0 AS GROUP_LIKE_FLAG,
-					0 AS GROUP_OPPOSE_FLAG,
-					0 AS GROUP_COMMENT_FLAG,
-					0 AS GROUP_JOIN_FLAG,
-					0 AS GROUP_CREATE_FLAG,
-					0 AS OPEN_FLAG,
-					date_format(ei.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_item ei 
-				WHERE ei.DEL_FLAG=0 
-				AND ei.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				group by ei.USER_ID,date_format(ei.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select 	met.USER_ID,
-									0 AS VOICE_LIKE_FLAG,
-									0 AS VOICE_OPPOSE_FLAG,
-									0 AS EVENT_PUBLISH_FLAG,
-									0 AS EVENT_LIKE_FLAG,
-									0 AS EVENT_OPPOSE_FLAG,
-									0 AS EVENT_COMMENT_FLAG,
-									0 AS EVENT_EVALUATE_FLAG,
-									COUNT(ID) AS GROUP_PUBLISH_FLAG,
-									0 AS GROUP_LIKE_FLAG,
-									0 AS GROUP_OPPOSE_FLAG,
-									0 AS GROUP_COMMENT_FLAG,
-									0 AS GROUP_JOIN_FLAG,
-									0 AS GROUP_CREATE_FLAG,
-									0 AS OPEN_FLAG,
-									date_format(met.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_topic met
-				where met.DEL_FLAG=0
-				AND met.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				GROUP BY met.USER_ID,date_format(met.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select  cua.USER_ID,
-									0 AS VOICE_LIKE_FLAG,
-									0 AS VOICE_OPPOSE_FLAG,
-									0 AS EVENT_PUBLISH_FLAG,
-									0 AS EVENT_LIKE_FLAG,
-									0 AS EVENT_OPPOSE_FLAG,
-									0 AS EVENT_COMMENT_FLAG,
-									0 AS EVENT_EVALUATE_FLAG,
-									0 AS GROUP_PUBLISH_FLAG,
-									COUNT(cua.ATTITUDE_FLAG=0 OR NULL) AS GROUP_LIKE_FLAG,
-									COUNT(cua.ATTITUDE_FLAG=1 OR NULL) AS GROUP_OPPOSE_FLAG,
-									0 AS GROUP_COMMENT_FLAG,
-									0 AS GROUP_JOIN_FLAG,
-									0 AS GROUP_CREATE_FLAG,
-									0 AS OPEN_FLAG,
-									date_format(cua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_topic_comment_user_attitude cua
-				left join meta_epdc_topic_comment etc on etc.ID=cua.COMMENT_ID
-				left join meta_epdc_topic met on etc.TOPIC_ID=met.ID
-				where cua.DEL_FLAG=0
-				AND cua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				GROUP BY cua.USER_ID,date_format(cua.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select  etc.USER_ID,
-									0 AS VOICE_LIKE_FLAG,
-									0 AS VOICE_OPPOSE_FLAG,
-									0 AS EVENT_PUBLISH_FLAG,
-									0 AS EVENT_LIKE_FLAG,
-									0 AS EVENT_OPPOSE_FLAG,
-									0 AS EVENT_COMMENT_FLAG,
-									0 AS EVENT_EVALUATE_FLAG,
-									0 AS GROUP_PUBLISH_FLAG,
-									0 AS GROUP_LIKE_FLAG,
-									0 AS GROUP_OPPOSE_FLAG,
-									COUNT(ID) AS GROUP_COMMENT_FLAG,
-									0 AS GROUP_JOIN_FLAG,
-									0 AS GROUP_CREATE_FLAG,
-									0 AS OPEN_FLAG,
-									date_format(etc.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_topic_comment etc
-				where etc.DEL_FLAG=0
-				AND etc.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				GROUP BY etc.USER_ID,date_format(etc.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select  eug.USER_ID,
-									0 AS VOICE_LIKE_FLAG,
-									0 AS VOICE_OPPOSE_FLAG,
-									0 AS EVENT_PUBLISH_FLAG,
-									0 AS EVENT_LIKE_FLAG,
-									0 AS EVENT_OPPOSE_FLAG,
-									0 AS EVENT_COMMENT_FLAG,
-									0 AS EVENT_EVALUATE_FLAG,
-									0 AS GROUP_PUBLISH_FLAG,
-									0 AS GROUP_LIKE_FLAG,
-									0 AS GROUP_OPPOSE_FLAG,
-									0 AS GROUP_COMMENT_FLAG,
-									COUNT(ID) AS GROUP_JOIN_FLAG,
-									0 AS GROUP_CREATE_FLAG,
-									0 AS OPEN_FLAG,
-									date_format(eug.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_user_group eug
-				where eug.DEL_FLAG=0 and LORD_FLAG=0
-				AND eug.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				GROUP BY eug.USER_ID,date_format(eug.CREATED_TIME,'%Y-%m-%d')
-			UNION ALL
-					select  eug.USER_ID,
-								0 AS VOICE_LIKE_FLAG,
-								0 AS VOICE_OPPOSE_FLAG,
-								0 AS EVENT_PUBLISH_FLAG,
-								0 AS EVENT_LIKE_FLAG,
-								0 AS EVENT_OPPOSE_FLAG,
-								0 AS EVENT_COMMENT_FLAG,
-								0 AS EVENT_EVALUATE_FLAG,
-								0 AS GROUP_PUBLISH_FLAG,
-								0 AS GROUP_LIKE_FLAG,
-								0 AS GROUP_OPPOSE_FLAG,
-								0 AS GROUP_COMMENT_FLAG,
-								0 AS GROUP_JOIN_FLAG,
-								COUNT(ID) AS GROUP_CREATE_FLAG,
-								0 AS OPEN_FLAG,
-								date_format(eug.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
-				from meta_epdc_user_group eug
-				where eug.DEL_FLAG=0 and LORD_FLAG=1
-				AND eug.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
-				GROUP BY eug.USER_ID,date_format(eug.CREATED_TIME,'%Y-%m-%d')
-		UNION ALL
-				select  eul.USER_ID,
+    <sql>SELECT  REPLACE(MD5(UUID()),'-','') AS ID,
+        meu.PARTY_FLAG AS PART_FLAG,
+        meu.ALL_DEPT_IDS,
+        total.*
+  from
+  (select  
+        total_flag.USER_ID,
+        IF(SUM(total_flag.VOICE_LIKE_FLAG)>0,1,0) AS VOICE_LIKE_FLAG,
+        IF(SUM(total_flag.VOICE_OPPOSE_FLAG)>0,1,0) AS VOICE_OPPOSE_FLAG,
+        IF(SUM(total_flag.EVENT_PUBLISH_FLAG)>0,1,0) AS EVENT_PUBLISH_FLAG,
+        IF(SUM(total_flag.EVENT_LIKE_FLAG)>0,1,0) AS EVENT_LIKE_FLAG,
+        IF(SUM(total_flag.EVENT_OPPOSE_FLAG)>0,1,0) AS EVENT_OPPOSE_FLAG,
+        IF(SUM(total_flag.EVENT_COMMENT_FLAG)>0,1,0) AS EVENT_COMMENT_FLAG,
+        IF(SUM(total_flag.EVENT_EVALUATE_FLAG)>0,1,0) AS EVENT_EVALUATE_FLAG,
+        IF(SUM(total_flag.GROUP_PUBLISH_FLAG)>0,1,0) AS GROUP_PUBLISH_FLAG,
+        IF(SUM(total_flag.GROUP_LIKE_FLAG)>0,1,0) AS GROUP_LIKE_FLAG,
+        IF(SUM(total_flag.GROUP_OPPOSE_FLAG)>0,1,0) AS GROUP_OPPOSE_FLAG,
+        IF(SUM(total_flag.GROUP_COMMENT_FLAG)>0,1,0) AS GROUP_COMMENT_FLAG,
+        IF(SUM(total_flag.GROUP_JOIN_FLAG)>0,1,0) AS GROUP_JOIN_FLAG,
+        IF(SUM(total_flag.GROUP_CREATE_FLAG)>0,1,0) AS GROUP_CREATE_FLAG,
+        IF(SUM(total_flag.OPEN_FLAG)>=4,1,0) AS OPEN_FLAG,
+        total_flag.CREATED_TIME,now() UPDATED_TIME
+  from (
+      select  enu.USER_ID,
+          COUNT(ATTITUDE_FLAG=0 OR NULL) AS VOICE_LIKE_FLAG,
+          COUNT(ATTITUDE_FLAG=1 OR NULL) AS VOICE_OPPOSE_FLAG,
+          0 AS EVENT_PUBLISH_FLAG,
+          0 AS EVENT_LIKE_FLAG,
+          0 AS EVENT_OPPOSE_FLAG,
+          0 AS EVENT_COMMENT_FLAG,
+          0 AS EVENT_EVALUATE_FLAG,
+          0 AS GROUP_PUBLISH_FLAG,
+          0 AS GROUP_LIKE_FLAG,
+          0 AS GROUP_OPPOSE_FLAG,
+          0 AS GROUP_COMMENT_FLAG,
+          0 AS GROUP_JOIN_FLAG,
+          0 AS GROUP_CREATE_FLAG,
+          0 AS OPEN_FLAG,
+          date_format(enu.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+      from meta_epdc_news_user_attitude enu
+      WHERE enu.DEL_FLAG=0 
+      AND enu.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+      group by enu.USER_ID,date_format(enu.CREATED_TIME,'%Y-%m-%d')
+    UNION ALL
+      select  mei.USER_ID,
+          0 AS VOICE_LIKE_FLAG,
+          0 AS VOICE_OPPOSE_FLAG,
+          COUNT(ID) AS EVENT_PUBLISH_FLAG,
+          0 AS EVENT_LIKE_FLAG,
+          0 AS EVENT_OPPOSE_FLAG,
+          0 AS EVENT_COMMENT_FLAG,
+          0 AS EVENT_EVALUATE_FLAG,
+          0 AS GROUP_PUBLISH_FLAG,
+          0 AS GROUP_LIKE_FLAG,
+          0 AS GROUP_OPPOSE_FLAG,
+          0 AS GROUP_COMMENT_FLAG,
+          0 AS GROUP_JOIN_FLAG,
+          0 AS GROUP_CREATE_FLAG,
+          0 AS OPEN_FLAG,
+        date_format(mei.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+      from meta_epdc_events mei
+      WHERE mei.DEL_FLAG=0 
+      AND mei.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+      group by mei.USER_ID,date_format(mei.CREATED_TIME,'%Y-%m-%d')
+    UNION ALL
+      select  attitude_total_flag.USER_ID,
+              0 AS VOICE_LIKE_FLAG,
+              0 AS VOICE_OPPOSE_FLAG,
+              0 AS EVENT_PUBLISH_FLAG,
+              SUM(attitude_total_flag.EVENT_LIKE_FLAG) AS EVENT_LIKE_FLAG,
+              SUM(attitude_total_flag.EVENT_OPPOSE_FLAG) AS EVENT_OPPOSE_FLAG,
+              0 AS EVENT_COMMENT_FLAG,
+              0 AS EVENT_EVALUATE_FLAG,
+              0 AS GROUP_PUBLISH_FLAG,
+              0 AS GROUP_LIKE_FLAG,
+              0 AS GROUP_OPPOSE_FLAG,
+              0 AS GROUP_COMMENT_FLAG,
+              0 AS GROUP_JOIN_FLAG,
+              0 AS GROUP_CREATE_FLAG,
+              0 AS OPEN_FLAG,
+              attitude_total_flag.CREATED_TIME
+      from (select  USER_ID,
+              COUNT(cua.ATTITUDE_FLAG=0 OR NULL) AS EVENT_LIKE_FLAG,
+              COUNT(cua.ATTITUDE_FLAG=1 OR NULL) AS EVENT_OPPOSE_FLAG,
+              date_format(cua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+          from meta_epdc_event_comment_user_attitude cua
+          where cua.DEL_FLAG=0 
+          AND cua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+          group by USER_ID,date_format(cua.CREATED_TIME,'%Y-%m-%d')
+        UNION all
+          select  USER_ID,
+              COUNT(eua.ATTITUDE_FLAG=0 OR NULL) AS EVENT_LIKE_FLAG,
+              COUNT(eua.ATTITUDE_FLAG=1 OR NULL) AS EVENT_OPPOSE_FLAG,
+              date_format(eua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+          from  meta_epdc_event_user_attitude eua
+          WHERE eua.DEL_FLAG=0 
+          AND eua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+          group by USER_ID,date_format(eua.CREATED_TIME,'%Y-%m-%d')
+          )attitude_total_flag
+        group by attitude_total_flag.USER_ID,attitude_total_flag.CREATED_TIME
+      UNION ALL
+          select  eec.USER_ID,
+          0 AS VOICE_LIKE_FLAG,
+          0 AS VOICE_OPPOSE_FLAG,
+          0 AS EVENT_PUBLISH_FLAG,
+          0 AS EVENT_LIKE_FLAG,
+          0 AS EVENT_OPPOSE_FLAG,
+          COUNT(eec.id) AS EVENT_COMMENT_FLAG,
+          0 AS EVENT_EVALUATE_FLAG,
+          0 AS GROUP_PUBLISH_FLAG,
+          0 AS GROUP_LIKE_FLAG,
+          0 AS GROUP_OPPOSE_FLAG,
+          0 AS GROUP_COMMENT_FLAG,
+          0 AS GROUP_JOIN_FLAG,
+          0 AS GROUP_CREATE_FLAG,
+          0 AS OPEN_FLAG,
+          date_format(eec.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_event_comment eec
+        WHERE eec.DEL_FLAG=0 
+        AND eec.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        group by eec.USER_ID,date_format(eec.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  ei.USER_ID,
+          0 AS VOICE_LIKE_FLAG,
+          0 AS VOICE_OPPOSE_FLAG,
+          0 AS EVENT_PUBLISH_FLAG,
+          0 AS EVENT_LIKE_FLAG,
+          0 AS EVENT_OPPOSE_FLAG,
+          0 AS EVENT_COMMENT_FLAG,
+          COUNT(ei.EVALUATION_SCORE is NOT NULL OR NULL) AS EVENT_EVALUATE_FLAG,
+          0 AS GROUP_PUBLISH_FLAG,
+          0 AS GROUP_LIKE_FLAG,
+          0 AS GROUP_OPPOSE_FLAG,
+          0 AS GROUP_COMMENT_FLAG,
+          0 AS GROUP_JOIN_FLAG,
+          0 AS GROUP_CREATE_FLAG,
+          0 AS OPEN_FLAG,
+          date_format(ei.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_item ei 
+        WHERE ei.DEL_FLAG=0 
+        AND ei.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        group by ei.USER_ID,date_format(ei.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  met.USER_ID,
+                  0 AS VOICE_LIKE_FLAG,
+                  0 AS VOICE_OPPOSE_FLAG,
+                  0 AS EVENT_PUBLISH_FLAG,
+                  0 AS EVENT_LIKE_FLAG,
+                  0 AS EVENT_OPPOSE_FLAG,
+                  0 AS EVENT_COMMENT_FLAG,
+                  0 AS EVENT_EVALUATE_FLAG,
+                  COUNT(ID) AS GROUP_PUBLISH_FLAG,
+                  0 AS GROUP_LIKE_FLAG,
+                  0 AS GROUP_OPPOSE_FLAG,
+                  0 AS GROUP_COMMENT_FLAG,
+                  0 AS GROUP_JOIN_FLAG,
+                  0 AS GROUP_CREATE_FLAG,
+                  0 AS OPEN_FLAG,
+                  date_format(met.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_topic met
+        where met.DEL_FLAG=0
+        AND met.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        GROUP BY met.USER_ID,date_format(met.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  cua.USER_ID,
+                  0 AS VOICE_LIKE_FLAG,
+                  0 AS VOICE_OPPOSE_FLAG,
+                  0 AS EVENT_PUBLISH_FLAG,
+                  0 AS EVENT_LIKE_FLAG,
+                  0 AS EVENT_OPPOSE_FLAG,
+                  0 AS EVENT_COMMENT_FLAG,
+                  0 AS EVENT_EVALUATE_FLAG,
+                  0 AS GROUP_PUBLISH_FLAG,
+                  COUNT(cua.ATTITUDE_FLAG=0 OR NULL) AS GROUP_LIKE_FLAG,
+                  COUNT(cua.ATTITUDE_FLAG=1 OR NULL) AS GROUP_OPPOSE_FLAG,
+                  0 AS GROUP_COMMENT_FLAG,
+                  0 AS GROUP_JOIN_FLAG,
+                  0 AS GROUP_CREATE_FLAG,
+                  0 AS OPEN_FLAG,
+                  date_format(cua.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_topic_comment_user_attitude cua
+        left join meta_epdc_topic_comment etc on etc.ID=cua.COMMENT_ID
+        left join meta_epdc_topic met on etc.TOPIC_ID=met.ID
+        where cua.DEL_FLAG=0
+        AND cua.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        GROUP BY cua.USER_ID,date_format(cua.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  etc.USER_ID,
+                  0 AS VOICE_LIKE_FLAG,
+                  0 AS VOICE_OPPOSE_FLAG,
+                  0 AS EVENT_PUBLISH_FLAG,
+                  0 AS EVENT_LIKE_FLAG,
+                  0 AS EVENT_OPPOSE_FLAG,
+                  0 AS EVENT_COMMENT_FLAG,
+                  0 AS EVENT_EVALUATE_FLAG,
+                  0 AS GROUP_PUBLISH_FLAG,
+                  0 AS GROUP_LIKE_FLAG,
+                  0 AS GROUP_OPPOSE_FLAG,
+                  COUNT(ID) AS GROUP_COMMENT_FLAG,
+                  0 AS GROUP_JOIN_FLAG,
+                  0 AS GROUP_CREATE_FLAG,
+                  0 AS OPEN_FLAG,
+                  date_format(etc.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_topic_comment etc
+        where etc.DEL_FLAG=0
+        AND etc.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        GROUP BY etc.USER_ID,date_format(etc.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  eug.USER_ID,
+                  0 AS VOICE_LIKE_FLAG,
+                  0 AS VOICE_OPPOSE_FLAG,
+                  0 AS EVENT_PUBLISH_FLAG,
+                  0 AS EVENT_LIKE_FLAG,
+                  0 AS EVENT_OPPOSE_FLAG,
+                  0 AS EVENT_COMMENT_FLAG,
+                  0 AS EVENT_EVALUATE_FLAG,
+                  0 AS GROUP_PUBLISH_FLAG,
+                  0 AS GROUP_LIKE_FLAG,
+                  0 AS GROUP_OPPOSE_FLAG,
+                  0 AS GROUP_COMMENT_FLAG,
+                  COUNT(ID) AS GROUP_JOIN_FLAG,
+                  0 AS GROUP_CREATE_FLAG,
+                  0 AS OPEN_FLAG,
+                  date_format(eug.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_user_group eug
+        where eug.DEL_FLAG=0 and LORD_FLAG=0
+        AND eug.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        GROUP BY eug.USER_ID,date_format(eug.CREATED_TIME,'%Y-%m-%d')
+      UNION ALL
+          select  eug.USER_ID,
+                0 AS VOICE_LIKE_FLAG,
+                0 AS VOICE_OPPOSE_FLAG,
+                0 AS EVENT_PUBLISH_FLAG,
+                0 AS EVENT_LIKE_FLAG,
+                0 AS EVENT_OPPOSE_FLAG,
+                0 AS EVENT_COMMENT_FLAG,
+                0 AS EVENT_EVALUATE_FLAG,
+                0 AS GROUP_PUBLISH_FLAG,
+                0 AS GROUP_LIKE_FLAG,
+                0 AS GROUP_OPPOSE_FLAG,
+                0 AS GROUP_COMMENT_FLAG,
+                0 AS GROUP_JOIN_FLAG,
+                COUNT(ID) AS GROUP_CREATE_FLAG,
+                0 AS OPEN_FLAG,
+                date_format(eug.CREATED_TIME,'%Y-%m-%d') AS CREATED_TIME
+        from meta_epdc_user_group eug
+        where eug.DEL_FLAG=0 and LORD_FLAG=1
+        AND eug.CREATED_TIME BETWEEN DATE_SUB(CURDATE(), interval ${statDays} day) AND DATE_SUB(CURDATE(), interval (${statDays}-1) day)
+        GROUP BY eug.USER_ID,date_format(eug.CREATED_TIME,'%Y-%m-%d')
+    UNION ALL
+        select  eul.USER_ID,
     0 AS VOICE_LIKE_FLAG,
     0 AS VOICE_OPPOSE_FLAG,
     0 AS EVENT_PUBLISH_FLAG,
@@ -939,21 +939,21 @@
     0 AS GROUP_JOIN_FLAG,
     0 AS GROUP_CREATE_FLAG,
     COUNT(ID) AS OPEN_FLAG,
-		DATE_SUB(CURDATE(), interval ${statDays} day) AS CREATED_TIME
+    DATE_SUB(CURDATE(), interval ${statDays} day) AS CREATED_TIME
 from epdc_user_login_log eul
 where eul.DEL_FLAG=0
 AND date_format(eul.LOGIN_TIME ,'%Y-%m') LIKE  DATE_FORMAT(now(),'%Y-%m')
 GROUP BY eul.USER_ID,date_format(eul.LOGIN_TIME,'%Y-%m')
-			)total_flag
-			group by total_flag.USER_ID,total_flag.CREATED_TIME
-			ORDER BY total_flag.CREATED_TIME
-		)total
-		left join meta_epdc_user meu on total.USER_ID=meu.ID and meu.DEL_FLAG=0
-		where meu.PARTY_FLAG is not null  
-		and meu.DEL_FLAG = '0'
-		 AND meu.state != '0'  
-		 and (total.VOICE_LIKE_FLAG + total.VOICE_OPPOSE_FLAG + total.EVENT_PUBLISH_FLAG + total.EVENT_LIKE_FLAG + total.EVENT_OPPOSE_FLAG +total.EVENT_COMMENT_FLAG + total.EVENT_EVALUATE_FLAG + total.GROUP_PUBLISH_FLAG + total.GROUP_LIKE_FLAG + total.GROUP_OPPOSE_FLAG + total.GROUP_JOIN_FLAG + total.GROUP_CREATE_FLAG + total.OPEN_FLAG + total.GROUP_COMMENT_FLAG ) > 0
-		order by total.CREATED_TIME</sql>
+      )total_flag
+      group by total_flag.USER_ID,total_flag.CREATED_TIME
+      ORDER BY total_flag.CREATED_TIME
+    )total
+    left join meta_epdc_user meu on total.USER_ID=meu.ID and meu.DEL_FLAG=0
+    where meu.PARTY_FLAG is not null  
+    and meu.DEL_FLAG = '0'
+     AND meu.state != '0'  
+     and (total.VOICE_LIKE_FLAG + total.VOICE_OPPOSE_FLAG + total.EVENT_PUBLISH_FLAG + total.EVENT_LIKE_FLAG + total.EVENT_OPPOSE_FLAG +total.EVENT_COMMENT_FLAG + total.EVENT_EVALUATE_FLAG + total.GROUP_PUBLISH_FLAG + total.GROUP_LIKE_FLAG + total.GROUP_OPPOSE_FLAG + total.GROUP_JOIN_FLAG + total.GROUP_CREATE_FLAG + total.OPEN_FLAG + total.GROUP_COMMENT_FLAG ) > 0
+    order by total.CREATED_TIME</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
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 3d06341b1..76eaf6f52 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 -1 day),'%Y-%m-%d') AS REACH_ACTIVE_TIME,
+				DATE_FORMAT(DATE_ADD(now(),interval -7 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,