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

KT，数据抽取修改

hotfix/yujt_opt
zhangyuan 6 years ago
parent
d90a92a654
commit
a168d0dad8
9 changed files with 764 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr
  2. 692
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr
  3. 50
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr
  4. 2
      epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr
  5. 2
      epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr
  6. 51
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
  7. 2
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr
  8. 2
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
  9. 73
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb

2
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr
View File

@ -602,7 +602,7 @@ VALUES
) )
VALUES VALUES
( (
${commId}, '${commName}', CURDATE(), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null ${commId}, '${commName}', DATE_SUB(CURDATE(), INTERVAL 1 DAY), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
)</sql> )</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>

692
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr
View File

@ -882,6 +882,26 @@
<to>设置日新增结案项目数变量</to> <to>设置日新增结案项目数变量</to>
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
<hop>
<from>月新增结案议题数</from>
<to>设置月新增结案议题数变量</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>月新增议题数</from>
<to>设置月新增议题数变量</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>月新增结案项目数</from>
<to>设置月新增结案项目数变量</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>月新增项目数</from>
<to>设置月新增项目数变量</to>
<enabled>Y</enabled>
</hop>
</order> </order>
<step> <step>
<name>党员数</name> <name>党员数</name>
@ -919,12 +939,454 @@ WHERE
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>192</xloc> <xloc>192</xloc>
<yloc>592</yloc> <yloc>592</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>党群数</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>source_ys_group</connection>
<sql>SELECT
COUNT(g.id) party_group_num
FROM
epdc_group g
WHERE
g.STATE = '10'
AND g.DEL_FLAG = '0'
AND find_in_set(${streetId}, g.ALL_DEPT_IDS);</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>participate_of_news</name>
<length>34</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>participate_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>read_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>read_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>like_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>like_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>192</xloc>
<yloc>176</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>总议题数</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>source_ys_events</connection>
<sql>SELECT
COUNT(i.ID) AS case_num
FROM
epdc_issue i
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS);</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>participate_of_news</name>
<length>34</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>participate_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>read_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>read_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>like_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>like_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>608</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>总项目数</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>source_ys_events</connection>
<sql>SELECT
COUNT(i.ID) AS project_num
FROM
epdc_item i
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS);</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>participate_of_news</name>
<length>34</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>participate_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>read_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>read_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>like_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>like_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>608</xloc>
<yloc>336</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>新增新闻数</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>source_ys_news</connection>
<sql>SELECT
COUNT(n.ID) AS new_news_num
FROM
epdc_news n
WHERE
n.DEL_FLAG = '0'
AND find_in_set(${streetId}, n.ALL_DEPT_IDS)
AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>participate_of_news</name>
<length>34</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>participate_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>read_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>read_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>BigNumber</type>
<storagetype>normal</storagetype>
<name>like_of_news</name>
<length>32</length>
<precision>0</precision>
<origin>新闻参与量阅读量点赞量</origin>
<comments>like_of_news</comments>
<conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol/>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>192</xloc>
<yloc>496</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>党群数</name> <name>新闻数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -934,15 +1396,14 @@ WHERE
<method>none</method> <method>none</method>
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>source_ys_group</connection> <connection>source_ys_news</connection>
<sql>SELECT <sql>SELECT
COUNT(g.id) party_group_num COUNT(n.ID) AS news_num
FROM FROM
epdc_group g epdc_news n
WHERE WHERE
g.STATE = '10' n.DEL_FLAG = '0'
AND g.DEL_FLAG = '0' AND find_in_set(${streetId}, n.ALL_DEPT_IDS);</sql>
AND find_in_set(${streetId}, g.ALL_DEPT_IDS);</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1030,12 +1491,12 @@ AND find_in_set(${streetId}, g.ALL_DEPT_IDS);</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>192</xloc> <xloc>192</xloc>
<yloc>176</yloc> <yloc>416</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>总议题数</name> <name>日新增结案议题数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1047,12 +1508,14 @@ AND find_in_set(${streetId}, g.ALL_DEPT_IDS);</sql>
</partitioning> </partitioning>
<connection>source_ys_events</connection> <connection>source_ys_events</connection>
<sql>SELECT <sql>SELECT
COUNT(i.ID) AS case_num COUNT(i.ID) AS topic_finish_num
FROM FROM
epdc_issue i epdc_issue i
WHERE WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS);</sql> AND ISSUE_STATE ='2'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1140,12 +1603,12 @@ WHERE
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>608</xloc>
<yloc>96</yloc> <yloc>256</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>总项目数</name> <name>日新增结案项目数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1157,12 +1620,14 @@ WHERE
</partitioning> </partitioning>
<connection>source_ys_events</connection> <connection>source_ys_events</connection>
<sql>SELECT <sql>SELECT
COUNT(i.ID) AS project_num COUNT(i.ID) AS project_finish_num
FROM FROM
epdc_item i epdc_item i
WHERE WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS);</sql> AND i.ITEM_STATE = '10'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1250,12 +1715,12 @@ WHERE
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>608</xloc>
<yloc>336</yloc> <yloc>496</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>新增新闻数</name> <name>日新增议题数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1265,15 +1730,15 @@ WHERE
<method>none</method> <method>none</method>
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>source_ys_news</connection> <connection>source_ys_events</connection>
<sql>SELECT <sql>SELECT
COUNT(n.ID) AS new_news_num COUNT(i.ID) AS new_case_num
FROM FROM
epdc_news n epdc_issue i
WHERE WHERE
n.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, n.ALL_DEPT_IDS) AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql> AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1360,13 +1825,13 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>192</xloc> <xloc>608</xloc>
<yloc>496</yloc> <yloc>176</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>新闻数</name> <name>日新增项目数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1376,14 +1841,15 @@ WHERE
<method>none</method> <method>none</method>
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>source_ys_news</connection> <connection>source_ys_events</connection>
<sql>SELECT <sql>SELECT
COUNT(n.ID) AS news_num COUNT(i.ID) AS new_project_num
FROM FROM
epdc_news n epdc_item i
WHERE WHERE
n.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, n.ALL_DEPT_IDS);</sql> AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1470,13 +1936,13 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>192</xloc> <xloc>608</xloc>
<yloc>416</yloc> <yloc>416</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>日新增结案议题数</name> <name>月新增结案议题数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1495,7 +1961,7 @@ WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND ISSUE_STATE ='2' AND ISSUE_STATE ='2'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS) AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql> AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1582,13 +2048,13 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>1024</xloc>
<yloc>256</yloc> <yloc>256</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>日新增结案项目数</name> <name>月新增结案项目数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1607,7 +2073,7 @@ WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND i.ITEM_STATE = '10' AND i.ITEM_STATE = '10'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS) AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql> AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1694,13 +2160,13 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>1024</xloc>
<yloc>496</yloc> <yloc>496</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>日新增议题数</name> <name>月新增议题数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1718,7 +2184,7 @@ FROM
WHERE WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS) AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql> AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1805,13 +2271,13 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>1024</xloc>
<yloc>176</yloc> <yloc>176</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step> <step>
<name>日新增项目数</name> <name>月新增项目数</name>
<type>TableInput</type> <type>TableInput</type>
<description/> <description/>
<distribute>Y</distribute> <distribute>Y</distribute>
@ -1829,7 +2295,7 @@ FROM
WHERE WHERE
i.DEL_FLAG = '0' i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS) AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);</sql> AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
@ -1916,7 +2382,7 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>608</xloc> <xloc>1024</xloc>
<yloc>416</yloc> <yloc>416</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -2449,6 +2915,142 @@ WHERE
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step>
<name>设置月新增结案议题数变量</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>topic_finish_num</field_name>
<variable_name>topic_finish_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value/>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>1264</xloc>
<yloc>256</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置月新增结案项目数变量</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>project_finish_num</field_name>
<variable_name>project_finish_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value/>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>1264</xloc>
<yloc>496</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置月新增议题数变量</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>new_case_num</field_name>
<variable_name>new_case_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value/>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>1264</xloc>
<yloc>176</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置月新增项目数变量</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>new_project_num</field_name>
<variable_name>new_project_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value/>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>1264</xloc>
<yloc>416</yloc>
<draw>Y</draw>
</GUI>
</step>
<step> <step>
<name>设置注册用户数变量</name> <name>设置注册用户数变量</name>
<type>SetVariable</type> <type>SetVariable</type>

50
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr
View File

@ -620,6 +620,56 @@ VALUES
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step>
<name>议题项目趋势分析-按月统计</name>
<type>ExecSQL</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>target_yushan</connection>
<execute_each_row>N</execute_each_row>
<single_statement>N</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>INSERT INTO ys_trend_month (
cal_date,
project_total_num,
project_finish_num,
topic_total_num,
topic_finish_num,
create_time,
update_time
)
VALUES
(
DATE_FORMAT(CURDATE(), '%Y-%m'), ${new_project_num_month}, ${project_finish_num_month}, ${new_case_num_month}, ${topic_finish_num_month}, NOW(), null
)</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
<delete_field/>
<read_field/>
<arguments>
</arguments>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>704</xloc>
<yloc>240</yloc>
<draw>Y</draw>
</GUI>
</step>
<step_error_handling> <step_error_handling>
</step_error_handling> </step_error_handling>
<slave-step-copy-partition-distribution> <slave-step-copy-partition-distribution>

2
epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr
View File

@ -790,7 +790,7 @@
<connection>source_ys_news</connection> <connection>source_ys_news</connection>
<sql>SELECT <sql>SELECT
COUNT(id) AS value, COUNT(id) AS value,
DATE_FORMAT(NOW(), '%Y') AS cal_date, DATE_FORMAT(CURDATE(), '%Y') AS cal_date,
NEWS_PROPERTY AS name, NEWS_PROPERTY AS name,
now() AS create_time now() AS create_time
FROM FROM

2
epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr
View File

@ -704,7 +704,7 @@ FROM
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND find_in_set(${streetId}, ALL_DEPT_IDS) AND find_in_set(${streetId}, ALL_DEPT_IDS)
AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 YEAR) AND YEAR (CREATED_TIME) = YEAR (date_sub(now(), INTERVAL 1 YEAR))
GROUP BY GROUP BY
NEWS_PROPERTY</sql> NEWS_PROPERTY</sql>
<limit>0</limit> <limit>0</limit>

51
epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
View File

@ -940,6 +940,44 @@ true;
<yloc>352</yloc> <yloc>352</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
<entry>
<name>清空新闻表</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>filename</specification_method>
<trans_object_id/>
<filename>${Internal.Entry.Current.Directory}/yushan_month_delete_st.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>288</xloc>
<yloc>656</yloc>
<attributes_kjc/>
</entry>
</entries> </entries>
<hops> <hops>
<hop> <hop>
@ -1160,7 +1198,7 @@ true;
</hop> </hop>
<hop> <hop>
<from>Start</from> <from>Start</from>
<to>街道下标</to> <to>社区下标</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
@ -1169,13 +1207,22 @@ true;
</hop> </hop>
<hop> <hop>
<from>Start</from> <from>Start</from>
<to>社区下标</to> <to>清空新闻表</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
<evaluation>Y</evaluation> <evaluation>Y</evaluation>
<unconditional>Y</unconditional> <unconditional>Y</unconditional>
</hop> </hop>
<hop>
<from>清空新闻表</from>
<to>街道下标</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
</hops> </hops>
<notepads> <notepads>
</notepads> </notepads>

2
epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr
View File

@ -567,7 +567,7 @@
<single_statement>N</single_statement> <single_statement>N</single_statement>
<replace_variables>Y</replace_variables> <replace_variables>Y</replace_variables>
<quoteString>N</quoteString> <quoteString>N</quoteString>
<sql>delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId};</sql> <sql>delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId} AND comm_id IS NOT NULL;;</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>
<update_field/> <update_field/>

2
epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
View File

@ -529,7 +529,7 @@
<single_statement>N</single_statement> <single_statement>N</single_statement>
<replace_variables>Y</replace_variables> <replace_variables>Y</replace_variables>
<quoteString>N</quoteString> <quoteString>N</quoteString>
<sql>delete from ys_news where cal_date like YEAR (NOW());</sql> <sql>delete from ys_news where cal_date like YEAR (NOW()) AND comm_id IS NULL ;</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>
<update_field/> <update_field/>

73
epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb
View File

@ -321,7 +321,7 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>240</xloc> <xloc>384</xloc>
<yloc>208</yloc> <yloc>208</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -359,7 +359,7 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>416</xloc> <xloc>576</xloc>
<yloc>208</yloc> <yloc>208</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -419,7 +419,7 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>608</xloc> <xloc>768</xloc>
<yloc>208</yloc> <yloc>208</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -457,53 +457,15 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>608</xloc> <xloc>576</xloc>
<yloc>320</yloc> <yloc>96</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>清空新闻表</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>filename</specification_method>
<trans_object_id/>
<filename>${Internal.Entry.Current.Directory}/yushan_month_delete_st.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>416</xloc>
<yloc>320</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
</entries> </entries>
<hops> <hops>
<hop> <hop>
<from>街道ID,NAME</from> <from>获取街道信息变量</from>
<to>获取街道信息变量</to> <to>写入写入议题项目趋势分析-按月统计</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
@ -511,17 +473,8 @@
<unconditional>N</unconditional> <unconditional>N</unconditional>
</hop> </hop>
<hop> <hop>
<from>Start</from> <from>街道ID,NAME</from>
<to>街道ID,NAME</to> <to>获取街道信息变量</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>Y</unconditional>
</hop>
<hop>
<from>获取街道信息变量</from>
<to>写入写入议题项目趋势分析-按月统计</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
@ -530,7 +483,7 @@
</hop> </hop>
<hop> <hop>
<from>街道ID,NAME</from> <from>街道ID,NAME</from>
<to>清空新闻表</to> <to>写入表</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
@ -538,13 +491,13 @@
<unconditional>N</unconditional> <unconditional>N</unconditional>
</hop> </hop>
<hop> <hop>
<from>清空新闻表</from> <from>Start</from>
<to>写入表</to> <to>街道ID,NAME</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
<enabled>Y</enabled> <enabled>Y</enabled>
<evaluation>Y</evaluation> <evaluation>Y</evaluation>
<unconditional>N</unconditional> <unconditional>Y</unconditional>
</hop> </hop>
</hops> </hops>
<notepads> <notepads>

Write Preview
Loading…
Cancel
Save