Merge branch 'feature' into 'release'

2023/1/11 17:49

See merge request !163

src/main/java/com/zhiwei/brandkbs2/service/CommonService.java

@@ -54,4 +54,8 @@ public interface CommonService {
 
     Long[] getTimeRangeDay();
 
+    Long[] getTimeRangeFormatWeek();
+
+    Long[] getTimeRangeFormatMonth();
+
 }

src/main/java/com/zhiwei/brandkbs2/service/impl/TaskServiceImpl.java

@@ -134,7 +134,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public void channelRecordListCache() {
         AtomicInteger total = new AtomicInteger();
-        List<Long[]> timeList = Arrays.asList(commonService.getTimeRangeDay(), commonService.getTimeRangeWeek(), commonService.getTimeRangeMonth());
+        List<Long[]> timeList = Arrays.asList(commonService.getTimeRangeDay(), commonService.getTimeRangeFormatWeek(), commonService.getTimeRangeFormatMonth());
         String sorter = "{\"index\":\"descend\"}";
         CompletableFuture.allOf(GlobalPojo.PROJECT_MAP.values().stream().map(project -> CompletableFuture.supplyAsync(() -> {
             UserThreadLocal.set(new UserInfo().setProjectId(project.getId()));