Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

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