项目详情接口调整

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

@@ -17,8 +17,7 @@ public interface ScreenProjectDataDao {
 
     List<String> selectIdsByAreaCode(@Param("areaCode") String areaCode);
 
-    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId,
+    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId);
-                                                                 @Param("customerId") String customerId);
 
     List<String> selectProjectImgs(@Param("projectId") String projectId,
                                    @Param("customerId") String customerId);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -98,17 +98,17 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
 
     @Override
     public Result projectDistributionDetail(ScreenProjectDetailFormDTO formDTO) {
-        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId(),formDTO.getCustomerId());
+        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId());
         resultDTOS.forEach(item -> {
             //项目图片
-            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),formDTO.getCustomerId());
+            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),item.getCustomerId());
             item.setImgList(imgList);
             //项目处理流程
-            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),formDTO.getCustomerId());
+            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),item.getCustomerId());
                 //流程附件
             processDTOS.forEach(processDTO -> {
                 List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> attachmentDTOS =
-                        screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),formDTO.getCustomerId());
+                        screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),item.getCustomerId());
                 processDTO.setAttachments(attachmentDTOS);
             });
             item.setProcessList(processDTOS);

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

@@ -72,7 +72,6 @@
         WHERE
             del_flag = '0'
             AND project_id = #{projectId}
-            and CUSTOMER_ID= #{customerId}
     </select>
     <select id="selectProjectImgs" resultType="java.lang.String">
         select PROJECT_IMG_URL from screen_project_img_data