From 4b2e994e1de9d4a0f56497f1a9b18beb04d585e8 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 30 Jun 2020 09:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B3=A8=E5=86=8C=E6=95=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=E4=B8=AD=E5=B1=85=E6=B0=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=92=E9=99=A4=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_totality_grid_query.ktr            | 58 ++++++++++---------
 .../screen_totality_grid_query_month.ktr      |  1 +
 .../screen_totality_grid_query_year.ktr       |  1 +
 .../kettle/screen-yushan/yushan_grid_day.kjb  |  4 +-
 .../screen-yushan/yushan_grid_month.kjb       |  6 +-
 5 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
index 727984c..f678445 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
@@ -768,7 +768,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>当月用户注册社群数</from>
+      <from>本月用户注册社群数</from>
       <to>设置本月用户注册社群数</to>
       <enabled>Y</enabled>
     </hop>
@@ -1152,7 +1152,7 @@ AND grid_id NOT IN (
     </remotesteps>
     <GUI>
       <xloc>128</xloc>
-      <yloc>464</yloc>
+      <yloc>384</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -1269,7 +1269,7 @@ AND grid_id NOT IN (
     </remotesteps>
     <GUI>
       <xloc>128</xloc>
-      <yloc>544</yloc>
+      <yloc>464</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -1426,6 +1426,7 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.PARTY_FLAG = '0'
 	AND YEAR (u.REGISTER_TIME) = YEAR (NOW())
 	AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -1790,8 +1791,8 @@ AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
       </output>
     </remotesteps>
     <GUI>
-      <xloc>560</xloc>
-      <yloc>624</yloc>
+      <xloc>128</xloc>
+      <yloc>704</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -1964,12 +1965,12 @@ GROUP BY
     </remotesteps>
     <GUI>
       <xloc>128</xloc>
-      <yloc>384</yloc>
+      <yloc>304</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>当月用户注册社群数</name>
+    <name>本月用户注册社群数</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -2215,8 +2216,8 @@ AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
       </output>
     </remotesteps>
     <GUI>
-      <xloc>560</xloc>
-      <yloc>544</yloc>
+      <xloc>128</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2489,6 +2490,7 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.PARTY_FLAG = '0'
 	AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
 	AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -2640,8 +2642,8 @@ AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>128</xloc>
-      <yloc>704</yloc>
+      <xloc>560</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2680,8 +2682,8 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>128</xloc>
-      <yloc>224</yloc>
+      <xloc>560</xloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2867,7 +2869,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>128</xloc>
-      <yloc>624</yloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2919,7 +2921,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>384</yloc>
+      <yloc>304</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3029,7 +3031,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>464</yloc>
+      <yloc>384</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3063,7 +3065,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>544</yloc>
+      <yloc>464</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3198,8 +3200,8 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>800</xloc>
-      <yloc>624</yloc>
+      <xloc>368</xloc>
+      <yloc>704</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3232,8 +3234,8 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>800</xloc>
-      <yloc>544</yloc>
+      <xloc>368</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3368,8 +3370,8 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>368</xloc>
-      <yloc>704</yloc>
+      <xloc>800</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3402,8 +3404,8 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>368</xloc>
-      <yloc>224</yloc>
+      <xloc>800</xloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3477,7 +3479,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>624</yloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3545,7 +3547,7 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>304</yloc>
+      <yloc>224</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -3661,7 +3663,7 @@ AND i.grid_id NOT IN (
     </remotesteps>
     <GUI>
       <xloc>128</xloc>
-      <yloc>304</yloc>
+      <yloc>224</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
index d8d2908..535262d 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
@@ -1247,6 +1247,7 @@ FROM
 	epdc_user u
 WHERE
 	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 find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
index 42ff421..c7ebb95 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
@@ -1240,6 +1240,7 @@ FROM
 	epdc_user u
 WHERE
 	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 STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' )
 	AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
index c251190..2b3f327 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
@@ -321,7 +321,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>320</xloc>
+      <xloc>304</xloc>
       <yloc>320</yloc>
       <attributes_kjc/>
     </entry>
@@ -419,7 +419,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>192</xloc>
+      <xloc>160</xloc>
       <yloc>320</yloc>
       <attributes_kjc/>
     </entry>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
index 16673cb..eb41e4f 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
@@ -359,7 +359,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>480</xloc>
+      <xloc>560</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -397,7 +397,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>688</xloc>
+      <xloc>736</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -480,7 +480,7 @@ true;</script>
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>368</xloc>
+      <xloc>400</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>