业务库到origin表 相关service挪到todata包下

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

@@ -28,12 +28,12 @@ import com.epmet.entity.stats.DimCustomerEntity;
 import com.epmet.entity.stats.DimDateEntity;
 import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.indexcal.*;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;

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

@@ -4,7 +4,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.util.DimIdGenerator;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java

@@ -4,8 +4,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.*;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -13,8 +13,8 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.*;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java

@@ -8,10 +8,10 @@ import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.stats.DimAgencyService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictDepartmentServiceImpl.java

@@ -7,9 +7,9 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.DimDepartmentDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollDistrictDepartmentService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.stats.DimDepartmentService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java

@@ -8,10 +8,10 @@ import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.stats.DimAgencyService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginExtractService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginExtractService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginGroupMainDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectOrgPeriodDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectOrgPeriodDailyService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicLogDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicLogDailyService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.form.ExtractFormDTO;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/GroupExtractService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/GroupExtractService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/IssueExtractService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/ProjectExtractService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectExtractService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 
 import com.epmet.dto.extract.form.ExtractFormDTO;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/ProjectPeriodExtractService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectPeriodExtractService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginExtractServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java

@@ -1,10 +1,10 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginGroupMainDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java

@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginGroupMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +31,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectMainDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +31,7 @@ import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectOrgPeriodDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectOrgPeriodDailyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -6,7 +6,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicLogDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicLogDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -23,7 +23,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicLogDailyService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -34,7 +34,7 @@ import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -9,7 +9,7 @@ import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.dto.stats.result.GridAttributesResultDTO;
-import com.epmet.service.evaluationindex.extract.GroupExtractService;
+import com.epmet.service.evaluationindex.extract.todata.GroupExtractService;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.service.stats.DimGridService;
 import com.epmet.service.user.UserService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
@@ -16,7 +16,7 @@ import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
 import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.service.Issue.IssueService;
-import com.epmet.service.evaluationindex.extract.IssueExtractService;
+import com.epmet.service.evaluationindex.extract.todata.IssueExtractService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/ProjectExtractServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -22,9 +22,9 @@ import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyE
 import com.epmet.entity.project.ProjectProcessEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.Issue.IssueService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
-import com.epmet.service.evaluationindex.extract.ProjectExtractService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.ProjectExtractService;
 import com.epmet.service.partymember.PartyMemberService;
 import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/ProjectPeriodExtractServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectPeriodExtractServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -7,7 +7,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
-import com.epmet.service.evaluationindex.extract.ProjectPeriodExtractService;
+import com.epmet.service.evaluationindex.extract.todata.ProjectPeriodExtractService;
 import com.epmet.service.project.ProjectProcessService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;