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
8590248098
commit
4b2e994e1d
5 changed files with 37 additions and 33 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. 58
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
  2. 1
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
  3. 1
      epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
  4. 4
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
  5. 6
      epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb

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

@ -768,7 +768,7 @@
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
<hop> <hop>
<from>当月用户注册社群数</from> <from>本月用户注册社群数</from>
<to>设置本月用户注册社群数</to> <to>设置本月用户注册社群数</to>
<enabled>Y</enabled> <enabled>Y</enabled>
</hop> </hop>
@ -1152,7 +1152,7 @@ AND grid_id NOT IN (
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>128</xloc>
<yloc>464</yloc> <yloc>384</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -1269,7 +1269,7 @@ AND grid_id NOT IN (
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>128</xloc>
<yloc>544</yloc> <yloc>464</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -1426,6 +1426,7 @@ FROM
epdc_user u epdc_user u
WHERE WHERE
u.DEL_FLAG = '0' u.DEL_FLAG = '0'
AND u.PARTY_FLAG = '0'
AND YEAR (u.REGISTER_TIME) = YEAR (NOW()) AND YEAR (u.REGISTER_TIME) = YEAR (NOW())
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql> AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
<limit>0</limit> <limit>0</limit>
@ -1790,8 +1791,8 @@ AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>560</xloc> <xloc>128</xloc>
<yloc>624</yloc> <yloc>704</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -1964,12 +1965,12 @@ GROUP BY
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>128</xloc>
<yloc>384</yloc> <yloc>304</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>
@ -2215,8 +2216,8 @@ AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>560</xloc> <xloc>128</xloc>
<yloc>544</yloc> <yloc>624</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -2489,6 +2490,7 @@ FROM
epdc_user u epdc_user u
WHERE WHERE
u.DEL_FLAG = '0' u.DEL_FLAG = '0'
AND u.PARTY_FLAG = '0'
AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql> AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
<limit>0</limit> <limit>0</limit>
@ -2640,8 +2642,8 @@ AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>560</xloc>
<yloc>704</yloc> <yloc>624</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -2680,8 +2682,8 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>560</xloc>
<yloc>224</yloc> <yloc>544</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -2867,7 +2869,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>128</xloc>
<yloc>624</yloc> <yloc>544</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -2919,7 +2921,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>368</xloc>
<yloc>384</yloc> <yloc>304</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3029,7 +3031,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>368</xloc>
<yloc>464</yloc> <yloc>384</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3063,7 +3065,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>368</xloc>
<yloc>544</yloc> <yloc>464</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3198,8 +3200,8 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>800</xloc> <xloc>368</xloc>
<yloc>624</yloc> <yloc>704</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3232,8 +3234,8 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>800</xloc> <xloc>368</xloc>
<yloc>544</yloc> <yloc>624</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3368,8 +3370,8 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>800</xloc>
<yloc>704</yloc> <yloc>624</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3402,8 +3404,8 @@ AND u.dept_id = ${gridId};</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>800</xloc>
<yloc>224</yloc> <yloc>544</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3477,7 +3479,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>368</xloc>
<yloc>624</yloc> <yloc>544</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3545,7 +3547,7 @@ AND u.dept_id = ${gridId};</sql>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>368</xloc> <xloc>368</xloc>
<yloc>304</yloc> <yloc>224</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
@ -3661,7 +3663,7 @@ AND i.grid_id NOT IN (
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>128</xloc> <xloc>128</xloc>
<yloc>304</yloc> <yloc>224</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>

1
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
View File

@ -1247,6 +1247,7 @@ FROM
epdc_user u epdc_user u
WHERE WHERE
u.DEL_FLAG = '0' u.DEL_FLAG = '0'
AND u.PARTY_FLAG = '0'
AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql> AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
<limit>0</limit> <limit>0</limit>

1
epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
View File

@ -1240,6 +1240,7 @@ FROM
epdc_user u epdc_user u
WHERE WHERE
u.DEL_FLAG = '0' u.DEL_FLAG = '0'
AND u.PARTY_FLAG = '0'
AND u.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) AND u.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' )
AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' )
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql> AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>

4
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>320</xloc> <xloc>304</xloc>
<yloc>320</yloc> <yloc>320</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>192</xloc> <xloc>160</xloc>
<yloc>320</yloc> <yloc>320</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>

6
epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
View File

@ -359,7 +359,7 @@
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>480</xloc> <xloc>560</xloc>
<yloc>208</yloc> <yloc>208</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>688</xloc> <xloc>736</xloc>
<yloc>208</yloc> <yloc>208</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
@ -480,7 +480,7 @@ true;</script>
<parallel>N</parallel> <parallel>N</parallel>
<draw>Y</draw> <draw>Y</draw>
<nr>0</nr> <nr>0</nr>
<xloc>368</xloc> <xloc>400</xloc>
<yloc>208</yloc> <yloc>208</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>

Write Preview
Loading…
Cancel
Save