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

修改重复变量名称

hotfix/yujt_opt
zhangyuan 5 years ago
parent
d10ab76aa4
commit
1226df50c6
3 changed files with 57 additions and 298 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. 307
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
  2. 2
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr
  3. 46
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb

307
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
View File

@ -772,31 +772,11 @@
<to>设置本月用户注册社群数</to> <to>设置本月用户注册社群数</to>
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
<hop>
<from>设置变量 3</from>
<to>本月用户注册数</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>设置变量 4</from>
<to>本月用户注册党员数</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>设置变量 5</from>
<to>当月用户注册社群数</to>
<enabled>Y</enabled>
</hop>
<hop> <hop>
<from>当月总议题数项目数</from> <from>当月总议题数项目数</from>
<to>设置上月总议题数项目数变量</to> <to>设置上月总议题数项目数变量</to>
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
<hop>
<from>设置变量</from>
<to>当月总议题数项目数</to>
<enabled>Y</enabled>
</hop>
<hop> <hop>
<from>当年用户注册社群数</from> <from>当年用户注册社群数</from>
<to>设置当年用户注册社群数</to> <to>设置当年用户注册社群数</to>
@ -812,21 +792,6 @@
<to>设置当年用户注册数</to> <to>设置当年用户注册数</to>
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
<hop>
<from>设置变量 3 2</from>
<to>当年用户注册数</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>设置变量 4 2</from>
<to>当年用户注册党员数</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>设置变量 5 2</from>
<to>当年用户注册社群数</to>
<enabled>Y</enabled>
</hop>
<hop> <hop>
<from>已关闭议题数</from> <from>已关闭议题数</from>
<to>设置已关闭议题数</to> <to>设置已关闭议题数</to>
@ -1443,7 +1408,7 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>416</yloc> <yloc>416</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -1577,7 +1542,7 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>336</yloc> <yloc>336</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -1712,7 +1677,7 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>496</yloc> <yloc>496</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -2138,7 +2103,7 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>256</yloc> <yloc>256</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -2506,7 +2471,7 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>176</yloc> <yloc>176</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -2640,7 +2605,7 @@ WHERE
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>928</xloc> <xloc>784</xloc>
<yloc>96</yloc> <yloc>96</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -2963,250 +2928,6 @@ AND u.dept_id = ${gridId};</sql>
<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_num_month</field_name>
<variable_name>topic_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
<field>
<field_name>project_num_month</field_name>
<variable_name>project_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>144</xloc>
<yloc>416</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 3</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_user_num</field_name>
<variable_name>reg_user_num</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 3 2</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_user_num_year</field_name>
<variable_name>reg_user_num_year</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>336</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 4</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_party_num</field_name>
<variable_name>reg_party_num</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>176</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 4 2</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_party_num_year</field_name>
<variable_name>reg_party_num_year</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>416</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 5</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_group_num</field_name>
<variable_name>reg_group_num</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>256</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>设置变量 5 2</name>
<type>SetVariable</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<field_name>reg_group_num_year</field_name>
<variable_name>reg_group_num_year</variable_name>
<variable_type>PARENT_JOB</variable_type>
<default_value>0</default_value>
</field>
</fields>
<use_formatting>Y</use_formatting>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>784</xloc>
<yloc>496</yloc>
<draw>Y</draw>
</GUI>
</step>
<step> <step>
<name>设置大屏网格信息变量</name> <name>设置大屏网格信息变量</name>
<type>SetVariable</type> <type>SetVariable</type>
@ -3456,7 +3177,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>416</yloc> <yloc>416</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3490,7 +3211,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>336</yloc> <yloc>336</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3524,7 +3245,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>496</yloc> <yloc>496</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3626,7 +3347,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>176</yloc> <yloc>176</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3660,7 +3381,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>96</yloc> <yloc>96</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3694,7 +3415,7 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>1168</xloc> <xloc>1024</xloc>
<yloc>256</yloc> <yloc>256</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
@ -3713,7 +3434,7 @@ AND u.dept_id = ${gridId};</sql>
<fields> <fields>
<field> <field>
<field_name>reg_party_num</field_name> <field_name>reg_party_num</field_name>
<variable_name>reg_party_num</variable_name> <variable_name>reg_party_num_month</variable_name>
<variable_type>PARENT_JOB</variable_type> <variable_type>PARENT_JOB</variable_type>
<default_value/> <default_value/>
</field> </field>
@ -3821,7 +3542,7 @@ AND u.dept_id = ${gridId};</sql>
<fields> <fields>
<field> <field>
<field_name>gridmaster</field_name> <field_name>gridmaster</field_name>
<variable_name>gridmaster0</variable_name> <variable_name>gridmaster</variable_name>
<variable_type>PARENT_JOB</variable_type> <variable_type>PARENT_JOB</variable_type>
<default_value/> <default_value/>
</field> </field>

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

@ -552,7 +552,7 @@
) )
VALUES VALUES
( (
${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num_now}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null ${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num_now}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num_month}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null
)</sql> )</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>

46
epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.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>352</xloc> <xloc>320</xloc>
<yloc>320</yloc> <yloc>320</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>528</xloc> <xloc>576</xloc>
<yloc>320</yloc> <yloc>320</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -397,7 +397,7 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>736</xloc> <xloc>752</xloc>
<yloc>320</yloc> <yloc>320</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -457,7 +457,36 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>912</xloc> <xloc>928</xloc>
<yloc>320</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>JavaScript</name>
<description/>
<type>EVAL</type>
<attributes/>
<script>parent_job.setVariable("case_num",0);
parent_job.setVariable("register_num",0);
parent_job.setVariable("project_num_now",0);
parent_job.setVariable("project_num_month",0);
parent_job.setVariable("topic_num_month",0);
parent_job.setVariable("close_case_num",0);
parent_job.setVariable("finish_project_num",0);
parent_job.setVariable("gridmaster",0);
parent_job.setVariable("reg_party_num_month",0);
parent_job.setVariable("finish_project_num_month",0);
parent_job.setVariable("reg_user_num",0);
parent_job.setVariable("reg_party_num",0);
parent_job.setVariable("reg_group_num",0);
parent_job.setVariable("reg_user_num_year",0);
parent_job.setVariable("reg_party_num_year",0);
parent_job.setVariable("reg_group_num_year",0);
true;</script>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>448</xloc>
<yloc>320</yloc> <yloc>320</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -492,6 +521,15 @@
</hop> </hop>
<hop> <hop>
<from>网格ID,NAME</from> <from>网格ID,NAME</from>
<to>JavaScript</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>JavaScript</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>

Write Preview
Loading…
Cancel
Save