diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr
index e7f8d67..a7e5771 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr
@@ -647,7 +647,7 @@ FROM
WHERE
n.DEL_FLAG = '0'
AND find_in_set(${commId}, n.ALL_DEPT_IDS)
- AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);
+ AND MONTH(n.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -869,7 +869,7 @@ WHERE
i.DEL_FLAG = '0'
AND ISSUE_STATE ='2'
AND find_in_set(${commId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -981,7 +981,7 @@ WHERE
i.DEL_FLAG = '0'
AND i.ITEM_STATE = '10'
AND find_in_set(${commId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1092,7 +1092,7 @@ FROM
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${commId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1203,7 +1203,7 @@ FROM
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${commId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr
index ef9c184..d3f30bd 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr
@@ -850,7 +850,7 @@ FROM
epdc_issue
WHERE
DEL_FLAG = '0'
- AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND GRID_ID = ${gridId}
GROUP BY
GRID_ID
@@ -863,7 +863,7 @@ FROM
epdc_item
WHERE
DEL_FLAG = '0'
- AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND GRID_ID = ${gridId}
GROUP BY
GRID_ID
@@ -1003,7 +1003,7 @@ FROM
WHERE
u.DEL_FLAG = '0'
AND u.PARTY_FLAG = '1'
-AND u.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+AND MONTH(u.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);
0
@@ -1137,7 +1137,7 @@ FROM
epdc_user u
WHERE
u.DEL_FLAG = '0'
- AND u.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(u.REGISTER_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND find_in_set(${gridId}, u.ALL_DEPT_IDS);
0
@@ -1271,7 +1271,7 @@ FROM
epdc_group
WHERE
DEL_FLAG = '0'
- AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND find_in_set(${gridId}, ALL_DEPT_IDS);
0
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr
index f94a3f4..b42ae72 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr
@@ -867,7 +867,7 @@ FROM
WHERE
n.DEL_FLAG = '0'
AND find_in_set(${streetId}, n.ALL_DEPT_IDS)
- AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY);
+ AND MONTH(n.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1089,7 +1089,7 @@ WHERE
i.DEL_FLAG = '0'
AND ISSUE_STATE ='2'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1201,7 +1201,7 @@ WHERE
i.DEL_FLAG = '0'
AND i.ITEM_STATE = '10'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1312,7 +1312,7 @@ FROM
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -1423,7 +1423,7 @@ FROM
WHERE
i.DEL_FLAG = '0'
AND find_in_set(${streetId}, i.ALL_DEPT_IDS)
- AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+ AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr
index 2f8aba4..6463fb5 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr
@@ -616,7 +616,7 @@ FROM
epdc_volunteer_info
WHERE
DEL_FLAG = '0'
-AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
@@ -680,7 +680,7 @@ FROM
epdc_act_info
WHERE
DEL_FLAG = '0'
-AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH);
+AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
0
N
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
index 463f5bf..faf70cc 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
@@ -2059,7 +2059,7 @@ FROM
WHERE
DEL_FLAG = '0'
AND find_in_set(${commId}, ALL_DEPT_IDS)
- AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
GROUP BY
NEWS_PROPERTY
0
@@ -2107,7 +2107,7 @@ FROM
epdc_events
WHERE
DEL_FLAG = '0'
-AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
AND find_in_set(${commId}, ALL_DEPT_IDS)
ORDER BY
COMMENT_NUM DESC
@@ -2354,7 +2354,7 @@ WHERE
ep.DEL_FLAG = '0'
AND pp.DEL_FLAG = '0'
AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
- AND ep.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(ep.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
GROUP BY
ep.id;
0
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
index 37df5c7..0073a28 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
@@ -1006,7 +1006,7 @@ FROM
WHERE
DEL_FLAG = '0'
AND find_in_set(${streetId}, ALL_DEPT_IDS)
- AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 MONTH)
+ AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
GROUP BY
NEWS_PROPERTY
0