Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java → 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());
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/topic/TopicController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/group/GroupDao.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/project/ProjectDao.java → 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.*;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.publicity;
+package com.epmet.datareport.dao.publicity;
 
 import com.epmet.publicity.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import com.epmet.screen.dto.result.TreeResultDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.screen;
+package com.epmet.datareport.dao.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/topic/TopicDao.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/GroupService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/IssueService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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.*;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassRootsGovernService.java → 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;
 
 /**
  * 基层治理相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/IndexService.java → 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;
 
 /**
  * 指数相关相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/PartyMemberLeadService.java → 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;
 
 /**
  * 党建引领相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/ProjectService.java → 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;
 
 /**
  * 项目

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java → 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.datareport.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.dto.result.AgencySubResultDTO;
-import com.epmet.dto.result.ProcessorListResultDTO;
 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java → 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;
 
 /**
  * 中央区相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassRootsGovernServiceImpl.java → 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;
 
 /**
  * 基层治理相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/IndexServiceImpl.java → 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;
 
 /**
  * 指数相关相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/PartyMemberLeadServiceImpl.java → 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;
 
 /**
  * 党建引领相关各指标查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/ProjectServiceImpl.java → 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;
 
 /**
  * 项目

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/TopicService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java → 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.datareport.service.topic.TopicService;
-import com.epmet.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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java → 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;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java → 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;

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -137,13 +137,13 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao.group" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.group" level="DEBUG"/>
-        <logger name="com.epmet.dao.issue" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.issue" level="DEBUG"/>
-        <logger name="com.epmet.dao.project" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.project" level="DEBUG"/>
-        <logger name="com.epmet.dao.publicity" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.publicity" level="DEBUG"/>
-        <logger name="com.epmet.dao.topic" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.topic" level="DEBUG"/>
-        <logger name="com.epmet.dao.user" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.user" level="DEBUG"/>
-        <logger name="com.epmet.dao.voice" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.voice" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -156,13 +156,13 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao.group" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.group" level="INFO"/>
-        <logger name="com.epmet.dao.issue" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.issue" level="INFO"/>
-        <logger name="com.epmet.dao.project" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.project" level="INFO"/>
-        <logger name="com.epmet.dao.publicity" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.publicity" level="INFO"/>
-        <logger name="com.epmet.dao.topic" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.topic" level="INFO"/>
-        <logger name="com.epmet.dao.user" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.user" level="INFO"/>
-        <logger name="com.epmet.dao.voice" level="INFO"/>
+        <logger name="com.epmet.datareport.dao.voice" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.group.GroupDao">
+<mapper namespace="com.epmet.datareport.dao.group.GroupDao">
 
     <!-- 网格小组：网格总数、网格小组数、小组平均数、小组人数中位数 -->
     <select id="summaryInfo" parameterType="java.lang.String" resultType="com.epmet.group.dto.result.GroupSummaryInfoResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.issue.IssueDao">
+<mapper namespace="com.epmet.datareport.dao.issue.IssueDao">
     <!--    获取当前机关统计信息-->
     <select id="selectAgencyInfo" resultType="com.epmet.issue.dto.result.IssueDataDTO">
         SELECT AGENCY_ID,

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.project.ProjectDao">
+<mapper namespace="com.epmet.datareport.dao.project.ProjectDao">
 
 
     <select id="selectProjectSummary" resultType="com.epmet.project.dto.result.ProjectSummaryResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.publicity.PublicityDao">
+<mapper namespace="com.epmet.datareport.dao.publicity.PublicityDao">
 
     <!-- 机关每日发文：文章累计发文数量、当前发文数量、数据截止日期 -->
     <select id="summaryInfo" resultType="com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenCpcBaseDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenCustomerAgencyDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao">
 
     <!-- 查询客户根组织ID -->
     <select id="selectRootAgencyId" resultType="com.epmet.screen.dto.result.TreeResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenCustomerDeptDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerDeptDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenCustomerGridDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerGridDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenDifficultyDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenDifficultyDataDao">
 
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenEventDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenEventDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenEventImgDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenEventImgDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenGovernRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenGovernRankDataDao">
 
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenIndexDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenOrgRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenOrgRankDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenPartyBranchDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenPartyLinkMassesDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenPartyUserRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyUserRankDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenPioneerDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenPioneerDataDao">
 
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenUserJoinDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenUserJoinDao">
 
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenUserTotalDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenUserTotalDataDao">
 
     <!-- 党员基本情况-饼状图概况 -->
     <select id="selectAgencyPartymemberPercent" resultType="com.epmet.screen.dto.result.PartymemberPercentResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenVoluntaryActivityDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenVoluntaryActivityDataDao">
 
 
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.topic.TopicDao">
+<mapper namespace="com.epmet.datareport.dao.topic.TopicDao">
 
     <!--获取话题数量及状态-->
     <select id="getTopicStatus" parameterType="java.lang.String" resultType="com.epmet.topic.dto.result.TopicStatusResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.user.UserAnalysisDao">
+<mapper namespace="com.epmet.datareport.dao.user.UserAnalysisDao">
     <!-- 根据机关id,查询它下一级机关列表   -->
     <select id="selectSubAgencyList" resultType="com.epmet.dto.DimAgencyDTO" parameterType="java.lang.String">
         SELECT