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 7d39531..0ba51a3 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 @@ -3882,7 +3882,7 @@ AND u.dept_id = ${gridId}; project_num - project_num + project_num_now PARENT_JOB diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr index 46fb323..1bb2602 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr @@ -552,7 +552,7 @@ ) VALUES ( - ${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num}, ${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}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null ) N @@ -608,8 +608,8 @@ VALUES - 656 - 368 + 928 + 544 Y @@ -646,8 +646,8 @@ VALUES - 448 - 240 + 720 + 416 Y @@ -684,8 +684,8 @@ VALUES - 448 - 496 + 928 + 416 Y @@ -722,8 +722,8 @@ VALUES - 448 - 368 + 720 + 544 Y