diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
index cee0ed9096..c8a3e68002 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
@@ -1,4 +1,4 @@
-package com.epmet;
+package com.epmet.datareport;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
index 7d4ff2d7d4..d57b2833e5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
@@ -1,4 +1,4 @@
-package com.epmet.aspect;
+package com.epmet.datareport.aspect;
import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
import org.aspectj.lang.ProceedingJoinPoint;
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
- @Around(value = "execution(* com.epmet.controller.*.*Controller*.*(..)) ")
+ @Around(value = "execution(* com.epmet.datareport.controller.*.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
similarity index 92%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
index c52ec15b50..10a4cdd6d7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
@@ -6,7 +6,7 @@
* 版权所有，侵权必究！
*/
-package com.epmet.config;
+package com.epmet.datareport.config;
import com.epmet.commons.tools.config.ModuleConfig;
import org.springframework.stereotype.Service;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/.gitignore b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/.gitignore
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/.gitignore
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/.gitignore
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
index 88dd3bb376..1d269eddbd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
@@ -9,7 +9,7 @@ import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
import com.epmet.group.dto.result.GroupSubAgencyResultDTO;
import com.epmet.group.dto.result.GroupSubGridResultDTO;
import com.epmet.group.dto.result.GroupSummaryInfoResultDTO;
-import com.epmet.service.group.GroupService;
+import com.epmet.datareport.service.group.GroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
index c9fad20ce2..afc732802d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
@@ -1,11 +1,11 @@
-package com.epmet.controller.issue;
+package com.epmet.datareport.controller.issue;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
import com.epmet.issue.dto.result.*;
-import com.epmet.service.issue.IssueService;
+import com.epmet.datareport.service.issue.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
index 8612d82002..f01540758c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.controller.publicity;
+package com.epmet.datareport.controller.publicity;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.NumConstant;
@@ -24,7 +24,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.publicity.dto.form.TagFormDTO;
import com.epmet.publicity.dto.result.*;
-import com.epmet.service.publicity.PublicityService;
+import com.epmet.datareport.service.publicity.PublicityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index 410a8da660..e69b0d51f1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
@@ -7,7 +7,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.screen.dto.form.CompartmentFormDTO;
import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
-import com.epmet.service.screen.AgencyService;
+import com.epmet.datareport.service.screen.AgencyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index b142d14893..c9b946f620 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -8,7 +8,7 @@ import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
-import com.epmet.service.screen.DistributionService;
+import com.epmet.datareport.service.screen.DistributionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
index 2d2c251a26..f5400c31ed 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
index 0eb55c6c2c..9747aa3ff9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
similarity index 86%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index 6bd6faab9b..d8417ddcdb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
index 6f730e9711..34b2fee3c0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
similarity index 85%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
index 20e5af2bf4..44f1a6407b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.screen;
+package com.epmet.datareport.controller.screen;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/topic/TopicController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/topic/TopicController.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/topic/TopicController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/topic/TopicController.java
index 233f31dc27..91edf636dd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/topic/TopicController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/topic/TopicController.java
@@ -1,10 +1,10 @@
-package com.epmet.controller.topic;
+package com.epmet.datareport.controller.topic;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.service.topic.TopicService;
+import com.epmet.datareport.service.topic.TopicService;
import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
import com.epmet.topic.dto.result.*;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
index cceebbef37..dda6b177cf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
@@ -1,4 +1,4 @@
-package com.epmet.controller.user;
+package com.epmet.datareport.controller.user;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -7,7 +7,7 @@ import com.epmet.dto.form.user.UserSubAgencyFormDTO;
import com.epmet.dto.form.user.UserSubGridFormDTO;
import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
import com.epmet.dto.result.user.*;
-import com.epmet.service.user.UserAnalysisService;
+import com.epmet.datareport.service.user.UserAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/.gitignore b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/.gitignore
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/.gitignore
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/.gitignore
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/group/GroupDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/group/GroupDao.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/group/GroupDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/group/GroupDao.java
index e2a8410272..975b49ba5a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/group/GroupDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/group/GroupDao.java
@@ -1,4 +1,4 @@
-package com.epmet.dao.group;
+package com.epmet.datareport.dao.group;
import com.epmet.group.dto.result.*;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/IssueDao.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/IssueDao.java
index abf2c4d350..53cab40c92 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/IssueDao.java
@@ -1,4 +1,4 @@
-package com.epmet.dao.issue;
+package com.epmet.datareport.dao.issue;
import com.epmet.issue.dto.result.IssueDataDTO;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/project/ProjectDao.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/project/ProjectDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/project/ProjectDao.java
index 3ae53720f7..b8920580bf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/project/ProjectDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/project/ProjectDao.java
@@ -1,4 +1,4 @@
-package com.epmet.dao.project;
+package com.epmet.datareport.dao.project;
import com.epmet.project.dto.FactAgencyProjectDailyDTO;
import com.epmet.project.dto.result.*;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/publicity/PublicityDao.java
similarity index 99%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/publicity/PublicityDao.java
index a4babe6039..b65c16b9a1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/publicity/PublicityDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.publicity;
+package com.epmet.datareport.dao.publicity;
import com.epmet.publicity.dto.result.*;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
index 2210a3b541..76edf9c12b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
index be2e05d62b..26bc852633 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.TreeResultDTO;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java
index 3a0ac47e2a..e6ae450514 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
index 45d5ba843b..92489cffc5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java
index e39518da61..ced4f66003 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
index e5ae922669..7ef0c0287b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java
index 66e45a7076..28809db0ce 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java
index 1f6b354383..9c08e1d226 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java
index d722725afc..1f038fd5b3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java
index eb501a0c4b..6369c71ee3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
index 08760ede69..83b3fb5c15 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java
index b7c6bd385d..637f4bf604 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java
index b888baed3d..caadd5520f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java
index cf086610d6..e2c01f7f9f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java
index 0eb4b041ac..34b2a61cbf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
index 3392dcdb9b..70477e48c6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
index 7b83a751c0..b4433d9b1d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/topic/TopicDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/topic/TopicDao.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/topic/TopicDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/topic/TopicDao.java
index 2ab863ab78..4c0fb9d377 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/topic/TopicDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/topic/TopicDao.java
@@ -1,6 +1,5 @@
-package com.epmet.dao.topic;
+package com.epmet.datareport.dao.topic;
-import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
import com.epmet.topic.dto.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/UserAnalysisDao.java
similarity index 99%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/UserAnalysisDao.java
index 2df268feb2..c0a69f82fc 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/UserAnalysisDao.java
@@ -1,4 +1,4 @@
-package com.epmet.dao.user;
+package com.epmet.datareport.dao.user;
import com.epmet.dto.DimAgencyDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/.gitignore b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/.gitignore
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/.gitignore
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/.gitignore
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/GroupService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/GroupService.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/GroupService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/GroupService.java
index d644029bcf..66d57fc92c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/GroupService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/GroupService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.group;
+package com.epmet.datareport.service.group;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.group.dto.form.GroupIncrTrendFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
index d1be53ee85..be4faf115d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
@@ -1,15 +1,15 @@
-package com.epmet.service.group.impl;
+package com.epmet.datareport.service.group.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dao.group.GroupDao;
+import com.epmet.datareport.dao.group.GroupDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.group.constant.GroupConstant;
import com.epmet.group.dto.form.GroupIncrTrendFormDTO;
import com.epmet.group.dto.result.*;
-import com.epmet.service.group.GroupService;
+import com.epmet.datareport.service.group.GroupService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/IssueService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/IssueService.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/IssueService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/IssueService.java
index c0d33b2a3b..d0b3b6156d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/IssueService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/IssueService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.issue;
+package com.epmet.datareport.service.issue;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
index d44576202e..86953616b1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
@@ -1,22 +1,20 @@
-package com.epmet.service.issue.impl;
+package com.epmet.datareport.service.issue.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dao.issue.IssueDao;
+import com.epmet.datareport.dao.issue.IssueDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.issue.constant.IssueConstant;
import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
import com.epmet.issue.dto.result.*;
-import com.epmet.service.issue.IssueService;
+import com.epmet.datareport.service.issue.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/ProjectService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
similarity index 98%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index 6e5366827f..41af9351ac 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
@@ -1,10 +1,10 @@
-package com.epmet.service.project.impl;
+package com.epmet.datareport.service.project.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dao.project.ProjectDao;
+import com.epmet.datareport.dao.project.ProjectDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/PublicityService.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/PublicityService.java
index bec823066c..35b6fff93b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/PublicityService.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.epmet.service.publicity;
+package com.epmet.datareport.service.publicity;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.publicity.dto.result.*;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
similarity index 98%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
index b01f9339bc..9a8ceaca2f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
@@ -15,16 +15,16 @@
* along with this program. If not, see .
*/
-package com.epmet.service.publicity.impl;
+package com.epmet.datareport.service.publicity.impl;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dao.publicity.PublicityDao;
+import com.epmet.datareport.dao.publicity.PublicityDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.publicity.dto.result.*;
-import com.epmet.service.publicity.PublicityService;
+import com.epmet.datareport.service.publicity.PublicityService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
index 58f429eca7..317cfde18d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.screen.dto.form.CompartmentFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
index 7aa880d9eb..c98ad3b6c0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassRootsGovernService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java
similarity index 77%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassRootsGovernService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java
index 2ec957601e..5c1343fcd1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassRootsGovernService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
/**
* 基层治理相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
similarity index 92%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
index ce74d350be..4f25eb5f0d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
similarity index 75%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/IndexService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
index da71854f81..069534f7b8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/IndexService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
/**
* 指数相关相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/PartyMemberLeadService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java
similarity index 77%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/PartyMemberLeadService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java
index 745720e6f8..61276a3c74 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/PartyMemberLeadService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
/**
* 党建引领相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java
similarity index 72%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/ProjectService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java
index 35b2ebbb2d..6998572bde 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/ProjectService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen;
+package com.epmet.datareport.service.screen;
/**
* 项目
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
index 2e732bba83..40260140d4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
@@ -1,16 +1,13 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.dto.result.AgencySubResultDTO;
-import com.epmet.dto.result.ProcessorListResultDTO;
+import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.screen.dto.form.CompartmentFormDTO;
import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
-import com.epmet.service.screen.AgencyService;
+import com.epmet.datareport.service.screen.AgencyService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
similarity index 91%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
index 1723fee251..7d2dad4706 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
@@ -1,4 +1,4 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
@@ -6,7 +6,7 @@ import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
-import com.epmet.service.screen.DistributionService;
+import com.epmet.datareport.service.screen.DistributionService;
/**
* 中央区相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
similarity index 61%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassRootsGovernServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
index 4dd3e63e15..751b4b8c50 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
@@ -1,6 +1,6 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
-import com.epmet.service.screen.GrassRootsGovernService;
+import com.epmet.datareport.service.screen.GrassRootsGovernService;
/**
* 基层治理相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
similarity index 86%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
index 23c42f7bcf..94cf163888 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -1,9 +1,9 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
-import com.epmet.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
-import com.epmet.service.screen.GrassrootsPartyDevService;
+import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
similarity index 60%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/IndexServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
index 7c5bf8bd7a..370d60016d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
@@ -1,6 +1,6 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
-import com.epmet.service.screen.IndexService;
+import com.epmet.datareport.service.screen.IndexService;
/**
* 指数相关相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
similarity index 61%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/PartyMemberLeadServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
index 4328a14279..cb85f7e75c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
@@ -1,6 +1,6 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
-import com.epmet.service.screen.PartyMemberLeadService;
+import com.epmet.datareport.service.screen.PartyMemberLeadService;
/**
* 党建引领相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
similarity index 56%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/ProjectServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
index b8713b165a..44741a7921 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
@@ -1,6 +1,6 @@
-package com.epmet.service.screen.impl;
+package com.epmet.datareport.service.screen.impl;
-import com.epmet.service.screen.ProjectService;
+import com.epmet.datareport.service.screen.ProjectService;
/**
* 项目
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/TopicService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/TopicService.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/TopicService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/TopicService.java
index 584ac1b1dc..f0dd505cb4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/TopicService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/TopicService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.topic;
+package com.epmet.datareport.service.topic;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
index 298dcae7a3..12889caaae 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
@@ -1,13 +1,12 @@
-package com.epmet.service.topic.impl;
+package com.epmet.datareport.service.topic.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dao.topic.TopicDao;
+import com.epmet.datareport.dao.topic.TopicDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.group.constant.GroupConstant;
-import com.epmet.service.topic.TopicService;
+import com.epmet.datareport.service.topic.TopicService;
import com.epmet.topic.constant.TopicConstant;
import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
import com.epmet.topic.dto.result.*;
@@ -16,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/UserAnalysisService.java
similarity index 98%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/UserAnalysisService.java
index 2c658fc1da..47c304f1b2 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/UserAnalysisService.java
@@ -1,4 +1,4 @@
-package com.epmet.service.user;
+package com.epmet.datareport.service.user;
import com.epmet.dto.form.user.UserIncrTrendFormDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
similarity index 99%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
index 3244076896..88e39067b4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
@@ -1,4 +1,4 @@
-package com.epmet.service.user.impl;
+package com.epmet.datareport.service.user.impl;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.constant.NumConstant;
@@ -7,7 +7,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.UserAnalysisConstant;
-import com.epmet.dao.user.UserAnalysisDao;
+import com.epmet.datareport.dao.user.UserAnalysisDao;
import com.epmet.dto.DimAgencyDTO;
import com.epmet.dto.DimDepartmentDTO;
import com.epmet.dto.DimGridDTO;
@@ -19,7 +19,7 @@ import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.dto.result.user.*;
import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.service.user.UserAnalysisService;
+import com.epmet.datareport.service.user.UserAnalysisService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index ad10364cb5..bfbabc6259 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -137,13 +137,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -156,13 +156,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
index b3b1faecd7..159a814a61 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
@@ -1,7 +1,7 @@
-
+