From d5cbd1776c36c669d8c4812b320a7d86d1829089 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 29 Jun 2020 13:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doc/kettle/screen-yushan/screen_totality_comm_query.ktr     | 2 +-
 .../doc/kettle/screen-yushan/screen_totality_comm_update.ktr    | 2 +-
 .../doc/kettle/screen-yushan/screen_totality_street_query.ktr   | 2 +-
 .../doc/kettle/screen-yushan/screen_totality_street_update.ktr  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr
index 2195db9..016caa6 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr
@@ -2094,7 +2094,7 @@ WHERE
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
-    <variables_active>N</variables_active>
+    <variables_active>Y</variables_active>
     <lazy_conversion_active>N</lazy_conversion_active>
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr
index 6a16bc8..41de5f6 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr
@@ -550,7 +550,7 @@
 )
 VALUES
 	(
-		${commId}, '${commName}', ${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, '${extend}', NOW(), null
+		${commId}, '${commName}', ${grid_num}, ${party_group_num}, ${user_num},  IFNULL(${user_num} / ${user_all} , 0 ), ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, '${extend}', NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr
index 67ab5f5..2451810 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr
@@ -1999,7 +1999,7 @@ WHERE
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
-    <variables_active>N</variables_active>
+    <variables_active>Y</variables_active>
     <lazy_conversion_active>N</lazy_conversion_active>
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr
index 12915a3..845d1e9 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr
@@ -547,7 +547,7 @@
 )
 VALUES
 	(
-		${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, NOW(), null
+		${grid_num}, ${party_group_num}, ${user_num}, IFNULL(${user_num} / ${user_all} , 0 ), ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>