Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java

@@ -68,16 +68,16 @@ public class FactAggregationExtractController {
 
             switch (formDTO.getType()) {
                 case "monthly":
-//                    extractGroupDataMonthly(param);
+                    extractGroupDataMonthly(param);
-//                    extractArticleDataMonthlyAndQuarterly(param);
+                    extractArticleDataMonthlyAndQuarterly(param);
                     break;
                 default:
-//                    extractUserDataDaily(param);
+                    extractUserDataDaily(param);
-//                    extractGroupDataDaily(param);
+                    extractGroupDataDaily(param);
                     extractTopicDataDaily(param);
                     extractIssueDataDaily(param);
                     extractProjectDataDaily(param);
-                    //extractAtricleDataDaily(param);
+                    extractAtricleDataDaily(param);
             }
         });
         return new Result();