diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr
index fea80db..533eb15 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr
@@ -513,58 +513,6 @@
-
- 网格排名表
- ExecSQL
-
- Y
-
- 1
-
- none
-
-
- target_yushan
- N
- N
- Y
- N
- INSERT INTO ys_grid_rank (
- cal_date,
- name,
- grid_id,
- comm_id,
- comm_name,
- topic_num,
- project_num,
- create_time,
- update_time
-)
-VALUES
- (
- DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num}, ${project_num}, NOW(), null
- )
- N
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 464
- 256
- Y
-
-
网格排名表年度数据清空
ExecSQL
@@ -581,7 +529,8 @@ VALUES
N
Y
N
- delete from ys_grid_rank where grid_id = ${gridId} and cal_date like YEAR (NOW());
+ delete from ys_grid_rank where grid_id = ${gridId} and cal_date like YEAR (NOW());
+delete from ys_grid_rank where grid_id = ${gridId} and cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m');
N
@@ -603,59 +552,6 @@ VALUES
Y
-
- 网格治理排行表-月
- ExecSQL
-
- Y
-
- 1
-
- none
-
-
- target_yushan
- N
- N
- Y
- N
- INSERT INTO ys_grid_gov_rank (
- comm_id,
- comm_name,
- cal_date,
- grid_name,
- grid_id,
- project_num,
- project_finish_num,
- finish_rate,
- create_time,
- update_time
-)
-VALUES
- (
- ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${project_num}, ${finish_project_num}, IFNULL(${finish_project_num} / ${project_num}, 0), NOW(), null
- )
- N
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 464
- 480
- Y
-
-
网格治理排行表清空-年
ExecSQL
@@ -672,7 +568,9 @@ VALUES
N
Y
N
- delete from ys_grid_gov_rank where grid_id = ${gridId} and cal_date like YEAR (NOW());
+ delete from ys_grid_gov_rank where grid_id = ${gridId} and cal_date like YEAR (NOW());
+delete from ys_grid_gov_rank where grid_id = ${gridId} and cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m');
+
N
@@ -689,60 +587,7 @@ VALUES
- 624
- 480
- Y
-
-
-
- 网格注册信息表
- ExecSQL
-
- Y
-
- 1
-
- none
-
-
- target_yushan
- N
- N
- Y
- N
- INSERT INTO ys_grid_reg (
- comm_id,
- comm_name,
- cal_date,
- name,
- grid_id,
- reg_user_num,
- reg_party_num,
- reg_group_num,
- create_time,
- update_time
-)
-VALUES
- (
- ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null
- )
- N
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 464
+ 800
368
Y
@@ -763,7 +608,8 @@ VALUES
N
Y
N
- delete from ys_grid_reg where grid_id = ${gridId} and cal_date like YEAR (NOW());
+ delete from ys_grid_reg where grid_id = ${gridId} and cal_date like YEAR (NOW());
+delete from ys_grid_reg where grid_id = ${gridId} and cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m');
N
@@ -785,44 +631,6 @@ VALUES
Y
-
- 清空网格治理排行表
- ExecSQL
-
- Y
-
- 1
-
- none
-
-
- target_yushan
- N
- N
- Y
- N
- delete from ys_grid_gov_rank where grid_id = ${gridId} and cal_date like YEAR (NOW())
- N
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 800
- 256
- Y
-
-
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
index a9ed60a..c4b708d 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
@@ -565,6 +565,59 @@ VALUES
Y
+
+ 网格治理排行表-年
+ ExecSQL
+
+ Y
+
+ 1
+
+ none
+
+
+ target_yushan
+ N
+ N
+ Y
+ N
+ INSERT INTO ys_grid_gov_rank (
+ comm_id,
+ comm_name,
+ cal_date,
+ grid_name,
+ grid_id,
+ project_num,
+ project_finish_num,
+ finish_rate,
+ create_time,
+ update_time
+)
+VALUES
+ (
+ ${commId}, '${commName}', DATE_FORMAT(CURDATE(), '%Y'), '${communityGrid}', ${gridId}, ${project_num_year}, ${finish_project_num_year}, IFNULL(${finish_project_num_year} / ${project_num_year}, 0), NOW(), null
+ )
+ N
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 464
+ 448
+ Y
+
+
网格注册信息表
ExecSQL
@@ -619,7 +672,59 @@ VALUES
- 网格治理排行表-年
+ 网格排名表 2
+ ExecSQL
+
+ Y
+
+ 1
+
+ none
+
+
+ target_yushan
+ N
+ N
+ Y
+ N
+ INSERT INTO ys_grid_rank (
+ cal_date,
+ name,
+ grid_id,
+ comm_id,
+ comm_name,
+ topic_num,
+ project_num,
+ create_time,
+ update_time
+)
+VALUES
+ (
+ DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num}, ${project_num}, NOW(), null
+ )
+ N
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 608
+ 256
+ Y
+
+
+
+ 网格治理排行表-月
ExecSQL
Y
@@ -648,7 +753,7 @@ VALUES
)
VALUES
(
- ${commId}, '${commName}', DATE_FORMAT(CURDATE(), '%Y'), '${communityGrid}', ${gridId}, ${project_num_year}, ${finish_project_num_year}, IFNULL(${finish_project_num_year} / ${project_num_year}, 0), NOW(), null
+ ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${project_num}, ${finish_project_num}, IFNULL(${finish_project_num} / ${project_num}, 0), NOW(), null
)
N
@@ -666,8 +771,61 @@ VALUES
- 464
- 448
+ 608
+ 480
+ Y
+
+
+
+ 网格注册信息表 2
+ ExecSQL
+
+ Y
+
+ 1
+
+ none
+
+
+ target_yushan
+ N
+ N
+ Y
+ N
+ INSERT INTO ys_grid_reg (
+ comm_id,
+ comm_name,
+ cal_date,
+ name,
+ grid_id,
+ reg_user_num,
+ reg_party_num,
+ reg_group_num,
+ create_time,
+ update_time
+)
+VALUES
+ (
+ ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null
+ )
+ N
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 608
+ 368
Y
diff --git a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
index 5adbe5e..d92dbcf 100644
--- a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
@@ -67,42 +67,34 @@