项目详情

epmet-module/data-report/data-report-client/pom.xml

@@ -17,6 +17,11 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-project-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java

@@ -20,4 +20,6 @@ public interface ProjectConstant {
      */
     String TYPE_EXCEPTION = "必要参数为空或参数格式错误";
 
+    String PROCESS_FAILURE = "查询项目进展失败......";
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDetailResultDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.project.dto.result;
+
+import com.epmet.dto.result.ProcesslistResultDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/23 10:13 上午
+ */
+@Data
+public class ProjectDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2450826789942547426L;
+
+    /** 【事件 = 项目】
+     * 事件标题
+     */
+    private String eventTitle;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 事件来源
+     */
+    private String eventSource;
+
+    /**
+     * 事件图片集合
+     */
+    private List<String> imgUrlList;
+
+    /**
+     * 项目进展
+     */
+    private List<ProcesslistResultDTO> processList;
+
+    public ProjectDetailResultDTO() {
+        this.eventTitle = "";
+        this.eventContent = "";
+        this.eventSource = "";
+        this.imgUrlList = new ArrayList<>();
+        this.processList = new ArrayList<>();
+    }
+}

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.exception.RenException;
 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.dto.form.ProcessListFormDTO;
 import com.epmet.module.project.service.ProjectService;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
@@ -78,4 +79,16 @@ 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));
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java

@@ -18,6 +18,7 @@
 package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.result.DifficultProjectResultDTO;
+import com.epmet.project.dto.result.ProjectDetailResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,4 +42,6 @@ public interface ScreenDifficultyDataDao {
     **/
     List<DifficultProjectResultDTO> selectDifficulty(@Param("agencyId")String agencyId,@Param("type")String type);
 
+    ProjectDetailResultDTO projectDetail(@Param("projectId")String projectId);
+
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.module.project.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.*;
 
@@ -41,4 +42,12 @@ public interface ProjectService {
      * @Description 数据-项目-日/月数据查询
      **/
     List<ProjectIncrTrendResultDTO> getProjectIncrTrend(TokenDto tokenDto, ProjectIncrTrendFormDTO formDTO);
+
+    /**
+     * @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

@@ -4,10 +4,15 @@ 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.commons.tools.utils.Result;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenDifficultyDataDao;
 import com.epmet.datareport.dao.project.ProjectDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.module.project.service.ProjectService;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;
@@ -35,6 +40,10 @@ public class ProjectServiceImpl implements ProjectService {
     private ProjectDao projectDao;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private ScreenDifficultyDataDao screenDifficultyDataDao;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
 
     /**
      * @Author sun
@@ -168,6 +177,26 @@ public class ProjectServiceImpl implements ProjectService {
         return resultList;
     }
 
+    /**
+     * @Description  项目详情
+     * @Param processListFormDTO
+     * @author zxc
+     * @date 2020/10/23 10:33 上午
+     */
+    @Override
+    public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) {
+        ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataDao.projectDetail(processListFormDTO.getProjectId());
+        if (null == projectDetailResultDTO){
+            return new ProjectDetailResultDTO();
+        }
+        Result<List<ProcesslistResultDTO>> processList = govProjectOpenFeignClient.getProcessList(processListFormDTO);
+        if (!processList.success()){
+            throw new RenException(ProjectConstant.PROCESS_FAILURE);
+        }
+        projectDetailResultDTO.setProcessList(processList.getData());
+        return projectDetailResultDTO;
+    }
+
     /**
      * @author sun
      * @Description 获取机关ID

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

@@ -30,4 +30,20 @@
          DESC
     </select>
 
+    <!-- 项目详情 -->
+    <select id="projectDetail" resultType="com.epmet.project.dto.result.ProjectDetailResultDTO">
+        SELECT
+            dd.event_title AS eventTitle,
+            dd.EVENT_CONTENT AS eventContent,
+            dd.EVENT_SOURCE AS eventSource,
+            GROUP_CONCAT( did.EVENT_IMG_URL ) AS imgUrlList
+        FROM
+            screen_difficulty_data dd
+            LEFT JOIN screen_difficulty_img_data did ON did.EVENT_ID = dd.EVENT_ID
+        WHERE
+            dd.DEL_FLAG = '0'
+            AND did.DEL_FLAG = '0'
+            AND dd.EVENT_ID = #{eventId}
+    </select>
+
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -1,8 +1,10 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
 import com.epmet.dto.result.PendProjectListResultDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
@@ -29,4 +31,7 @@ public interface GovProjectOpenFeignClient {
 	 */
 	@PostMapping("gov/project/project/pendprojectlist")
 	Result<List<PendProjectListResultDTO>> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO);
+
+	@PostMapping("gov/project/trace/processlistnotrule")
+	Result<List<ProcesslistResultDTO>> getProcessList(@RequestBody ProcessListFormDTO fromDTO);
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -3,8 +3,10 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
 import com.epmet.dto.result.PendProjectListResultDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -22,4 +24,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<List<PendProjectListResultDTO>> getPendProjectList(ProjectListFromDTO fromDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getPendProjectList", fromDTO);
 	}
+
+	@Override
+	public Result<List<ProcesslistResultDTO>> getProcessList(ProcessListFormDTO fromDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProcessList", fromDTO);
+	}
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java

@@ -179,6 +179,19 @@ public class ProjectTraceController {
 		return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));
 	}
 
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author zxc
+	 * @Description 项目跟踪-项目处理进展列表
+	 **/
+	@PostMapping("processlistnotrule")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
+	public Result<List<ProcesslistResultDTO>> processListNotRule(@RequestBody ProcessListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));
+	}
+
 	/**
 	 * @param formDTO
 	 * @return