feat: 月报周期

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -240,8 +240,8 @@ public class MaterialDataStaticsController {
                 startTime = DateUtil.beginOfWeek(DateUtil.lastWeek());
                 endTime = DateUtil.endOfWeek(DateUtil.lastWeek());
             } else {
-                startTime = DateUtil.beginOfMonth(DateUtil.lastWeek());
-                endTime = DateUtil.endOfMonth(DateUtil.lastWeek());
+                startTime = DateUtil.beginOfMonth(DateUtil.lastMonth());
+                endTime = DateUtil.endOfMonth(DateUtil.lastMonth());
             }
             MaterialPersonalUsedDataVO temp = new MaterialPersonalUsedDataVO();
             temp.setStartTime(startTime);
@@ -293,8 +293,8 @@ public class MaterialDataStaticsController {
                 startTime = DateUtil.beginOfWeek(DateUtil.lastWeek());
                 endTime = DateUtil.endOfWeek(DateUtil.lastWeek());
             } else {
-                startTime = DateUtil.beginOfMonth(DateUtil.lastWeek());
-                endTime = DateUtil.endOfMonth(DateUtil.lastWeek());
+                startTime = DateUtil.beginOfMonth(DateUtil.lastMonth());
+                endTime = DateUtil.endOfMonth(DateUtil.lastMonth());
             }
             temp.setStartTime(startTime);
             temp.setEndTime(endTime);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java

@@ -261,8 +261,8 @@ public class MaterialDataAdaptor {
             startTime = DateUtil.beginOfWeek(DateUtil.lastWeek());
             endTime = DateUtil.endOfWeek(DateUtil.lastWeek());
         } else {
-            startTime = DateUtil.beginOfMonth(DateUtil.lastWeek());
-            endTime = DateUtil.endOfMonth(DateUtil.lastWeek());
+            startTime = DateUtil.beginOfMonth(DateUtil.lastMonth());
+            endTime = DateUtil.endOfMonth(DateUtil.lastMonth());
             apolloKey = MATERIAL_CLERK_MONTH_DATA;
         }
         Map<String, Object> params = new HashMap<>();
@@ -332,8 +332,8 @@ public class MaterialDataAdaptor {
             startTime = DateUtil.beginOfWeek(DateUtil.lastWeek());
             endTime = DateUtil.endOfWeek(DateUtil.lastWeek());
         } else {
-            startTime = DateUtil.beginOfMonth(DateUtil.lastWeek());
-            endTime = DateUtil.endOfMonth(DateUtil.lastWeek());
+            startTime = DateUtil.beginOfMonth(DateUtil.lastMonth());
+            endTime = DateUtil.endOfMonth(DateUtil.lastMonth());
             apolloKey = MATERIAL_STORE_MONTH_DATA;
         }
         Map<String, Object> params = new HashMap<>();
@@ -405,8 +405,8 @@ public class MaterialDataAdaptor {
             startTime = DateUtil.beginOfWeek(DateUtil.lastWeek());
             endTime = DateUtil.endOfWeek(DateUtil.lastWeek());
         } else {
-            startTime = DateUtil.beginOfMonth(DateUtil.lastWeek());
-            endTime = DateUtil.endOfMonth(DateUtil.lastWeek());
+            startTime = DateUtil.beginOfMonth(DateUtil.lastMonth());
+            endTime = DateUtil.endOfMonth(DateUtil.lastMonth());
             apolloKey = MATERIAL_AREA_MONTH_DATA;
         }
         Map<String, Object> params = new HashMap<>();