删除错误包

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

@@ -8,12 +8,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.commons.tools.utils.Result;
-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;
@@ -21,20 +15,10 @@ 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;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-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;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
@@ -258,9 +242,9 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     /**
+     * @return
      * @Description 难点赌点-获取组织下拉框
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
-     * @return
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
@@ -270,7 +254,7 @@ public class ProjectServiceImpl implements ProjectService {
 
         //1、根据token获取本级agencyId、获取userId
         String agencyId = getLoginUserDetails(tokenDto);
-        String userId=getLoginUserUserId(tokenDto);
+        String userId = getLoginUserUserId(tokenDto);
 
         //2、获取本级组织机构
         Result<CustomerAgencyDTO> customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(agencyId);
@@ -282,11 +266,11 @@ public class ProjectServiceImpl implements ProjectService {
 
 
         //3、获取下一级组织机构\网格
-        if( customerAgencyDTO.getData().getLevel() == "community" ){
+        if (customerAgencyDTO.getData().getLevel() == "community") {
             //取下级网格
             Result<List<GridByStaffResultDTO>> gridListResult = govOrgOpenFeignClient.listGridsbystaffid(userId);
             List<GridByStaffResultDTO> gridList = gridListResult.getData();
-            for(int i=0;i<gridList.size();i++){
+            for (int i = 0; i < gridList.size(); i++) {
                 ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO();
                 subAgencyDto.setOrgId(agencyId);
                 subAgencyDto.setOrgName(customerAgencyDTO.getData().getOrganizationName());
@@ -301,7 +285,7 @@ public class ProjectServiceImpl implements ProjectService {
             Result<SubAgencyResultDTO> SubAgencyResultDTO = govOrgOpenFeignClient.subAgencyList(form);
 
             List<SubListResultDTO> subAgencyList = SubAgencyResultDTO.getData().getAgencyList();
-            for(int i=0;i<subAgencyList.size();i++){
+            for (int i = 0; i < subAgencyList.size(); i++) {
                 ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO();
                 subAgencyDto.setOrgId(subAgencyList.get(i).getAgencyId());
                 subAgencyDto.setOrgName(subAgencyList.get(i).getAgencyName());
@@ -310,29 +294,29 @@ public class ProjectServiceImpl implements ProjectService {
             }
         }
 
-        if(null == resultList) return new ArrayList<>();
+        if (null == resultList) return new ArrayList<>();
         return resultList;
     }
 
     /**
-     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
-     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @param param
      * @return
+     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<ProjectDifficultRankResultDTO> getDifficultyRank(DifficultyRankFormDTO param) {
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRank(param);
-        for (int i = 0; i < result.size (); i ++){
-            List<String> imgUrlList  ;
-            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId()) ;
+        for (int i = 0; i < result.size(); i++) {
+            List<String> imgUrlList;
+            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId());
 
             result.get(i).setImgUrlList(imgUrlList);
         }
-        if(null == result) return new ArrayList<>();
+        if (null == result) return new ArrayList<>();
         return result;
     }