Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp

# Conflicts:
#	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
#	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
#	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
#	epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
#	epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java

@@ -7,7 +7,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.dto.form.ProcessListFormDTO;
-import com.epmet.module.project.service.ProjectService;
+import com.epmet.datareport.service.project.ProjectService;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
@@ -43,7 +44,7 @@ public class ProjectController {
 
     /**
      * @Author sun
-     * @Description t
+     * @Description 数据-项目-获取组织下饼图数据
      **/
     @PostMapping("summaryinfo")
     public Result<List<ProjectSummaryInfoResultDTO>> summaryInfo(@LoginUser TokenDto tokenDto) {
@@ -81,6 +82,18 @@ public class ProjectController {
         return new Result<List<ProjectIncrTrendResultDTO>>().ok(projectService.getProjectIncrTrend(tokenDto, formDTO));
     }
 
+    /**
+     * @Description  项目详情
+     * @Param processListFormDTO
+     * @author zxc
+     * @date 2020/10/23 10:31 上午
+     */
+    @PostMapping("projectdetail")
+    public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProcessListFormDTO processListFormDTO){
+        ValidatorUtils.validateEntity(processListFormDTO);
+        return new Result<ProjectDetailResultDTO>().ok(projectService.projectDetail(processListFormDTO));
+    }
+
     /**
      * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
@@ -110,16 +123,4 @@ public class ProjectController {
 
 
 
-    /**
-     * @Description  项目详情
-     * @Param processListFormDTO
-     * @author zxc
-     * @date 2020/10/23 10:31 上午
-     */
-    @PostMapping("projectdetail")
-    public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProcessListFormDTO processListFormDTO){
-        ValidatorUtils.validateEntity(processListFormDTO);
-        return new Result<ProjectDetailResultDTO>().ok(projectService.projectDetail(processListFormDTO));
-    }
-
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java

@@ -44,6 +44,14 @@ public interface ProjectService {
      **/
     List<ProjectIncrTrendResultDTO> getProjectIncrTrend(TokenDto tokenDto, ProjectIncrTrendFormDTO formDTO);
 
+    /**
+     * @Description  项目详情
+     * @Param processListFormDTO
+     * @author zxc
+     * @date 2020/10/23 10:33 上午
+     */
+    ProjectDetailResultDTO projectDetail( ProcessListFormDTO processListFormDTO);
+
     /**
      * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
@@ -62,12 +70,4 @@ public interface ProjectService {
      * @date 2020.10.19 16:38
      **/
     List<ProjectNextAgencyResultDTO> getMyNextAgency(TokenDto tokenDto);
-
-    /**
-     * @Description  项目详情
-     * @Param processListFormDTO
-     * @author zxc
-     * @date 2020/10/23 10:33 上午
-     */
-    ProjectDetailResultDTO projectDetail( ProcessListFormDTO processListFormDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -13,6 +13,13 @@ import com.epmet.datareport.dao.project.ProjectDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.project.ProjectDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService;
+import com.epmet.datareport.service.project.ProjectService;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.SubAgencyFormDTO;
 import com.epmet.dto.result.GridByStaffResultDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
@@ -21,8 +28,10 @@ import com.epmet.dto.result.SubAgencyResultDTO;
 import com.epmet.dto.result.SubListResultDTO;
 import com.epmet.dto.result.ProcessAndCurrentDeptResultDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.module.project.service.ProjectService;
@@ -30,6 +39,7 @@ import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
+import com.epmet.project.dto.result.ProjectDetailResultDTO;
 import com.epmet.project.dto.result.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@@ -60,6 +60,18 @@ public interface EpmetCommonServiceOpenFeignClient {
     @PostMapping("/commonservice/externalapp/get-secret")
     Result getSecret(@RequestBody String appId);
 
+    /**
+     * @Description 获取AccessToken
+     * @return Result
+     * @author wxz
+     * @date 2020.10.22 10:19
+     */
+    @PostMapping("/commonservice/externalapp/get-jwt-accesstoken")
+    Result getAccessToken(@RequestBody GetJwtAccessTokenFormDTO form);
+
+    @PostMapping("/commonservice/externalapp/appidinfo")
+    Result<AppIdInfoResultDTO> appIdInfo(@RequestBody String appId);
+
     /**
      * 工作日计算
      * @author zhaoqifeng
@@ -89,16 +101,4 @@ public interface EpmetCommonServiceOpenFeignClient {
      */
     @PostMapping("commonservice/workday/workminutes")
     Result<Map<String,Integer>> workMinutes(@RequestBody WorkMinuteFormDTO param);
-
-    /**
-     * @Description 获取AccessToken
-     * @return Result
-     * @author wxz
-     * @date 2020.10.22 10:19
-     */
-    @PostMapping("/commonservice/externalapp/get-jwt-accesstoken")
-    Result getAccessToken(@RequestBody GetJwtAccessTokenFormDTO form);
-
-    @PostMapping("/commonservice/externalapp/appidinfo")
-    Result<AppIdInfoResultDTO> appIdInfo(@RequestBody String appId);
 }

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -10,6 +10,7 @@ import com.epmet.dto.form.WorkDayFormDTO;
 import com.epmet.dto.result.AppIdInfoResultDTO;
 import com.epmet.dto.form.WorkMinuteFormDTO;
 import com.epmet.dto.result.CostDayResultDTO;
+import com.epmet.dto.result.AppIdInfoResultDTO;
 import com.epmet.dto.result.ExternalAppAuthResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -46,6 +47,16 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "getSecret", appId);
     }
 
+    @Override
+    public Result<AppIdInfoResultDTO> appIdInfo(String appId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "appIdInfo", appId);
+    }
+
+    @Override
+    public Result getAccessToken(GetJwtAccessTokenFormDTO form) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "getAccessToken", form);
+    }
+
     /**
      * 工作日计算
      *
@@ -76,14 +87,4 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
     public Result<Map<String, Integer>> workMinutes(WorkMinuteFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workMinutes", param);
     }
-
-    @Override
-    public Result<AppIdInfoResultDTO> appIdInfo(String appId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "appIdInfo", appId);
-    }
-
-    @Override
-    public Result getAccessToken(GetJwtAccessTokenFormDTO form) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "getAccessToken", form);
-    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -38,6 +38,7 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
+import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectDTO;