Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -230,4 +230,16 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<ProjectCategoryByDateDTO> selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate,
 															   @Param("orgId")String orgId,@Param("codeLength")Integer codeLength);
 
+	/**
+	 * 数据分析-个人档案-事件详情页面的研判分析项目列表
+	 * @param customerId
+	 * @param categoryCode
+	 * @param excludeProjectId
+	 * @param epmetUserIds
+	 * @return
+	 */
+	List<ProjectInfoIcData> selectCommonCategoryEventProject(@Param("customerId")String customerId,
+															 @Param("categoryCode")String categoryCode,
+															 @Param("excludeProjectId") String excludeProjectId,
+															 @Param("epmetUserIds")List<String> epmetUserIds);
 }

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

@@ -694,8 +694,13 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         }
         IcResiUserBriefDTO icResiUserDTO = userRes.getData();
         ResiEventResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiEventResearchAnalysisResDTO.class);
-        resultDTO.setEpmetUserIdList(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList());
         resultDTO.setProjectData(new ArrayList<>());
+        if(CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            //灭有找到小程序里的用户id, 所以不用查询接下来的项目了.....
+            return resultDTO;
+        }
+        resultDTO.setEpmetUserIdList(formDTO.getEpmetUserIdList());
+
         // 先判断这个项目是否有分类没有直接返回
         List<ProjectCategoryDTO> projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId());
         if(CollectionUtils.isEmpty(projectCategoryDTOList)){
@@ -740,10 +745,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         List<ProjectDataDTO> projectData=new ArrayList<>();
         for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){
             //当前项目分类一致，排除当前项目，相同分类编码
-            //todo
+            List<ProjectInfoIcData> projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
-            List<ProjectInfoIcData> projectList=null;
+                    categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList());
-                    //projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
-                    //categoryDictDTO.getCategoryCode(),formDTO.getProjectId());
             if(!CollectionUtils.isEmpty(projectList)){
                 ProjectDataDTO projectDataDTO=new ProjectDataDTO();
                 projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode());

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

@@ -412,4 +412,29 @@
           AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         ORDER BY projectId
     </select>
+
+    <!--    数据分析-个人档案-事件详情页面的研判分析项目列表 -->
+    <select id="selectCommonCategoryEventProject" parameterType="map" resultType="com.epmet.dto.result.ProjectInfoIcData">
+        select
+            distinct pc.PROJECT_ID as projectId,
+            p.TITLE as projectTitle,
+            p.ORIGIN_ID as resiEventId,
+            p.`STATUS` as projectStatus
+        from project_category pc
+        inner join project p
+        on(pc.PROJECT_ID=p.id)
+        inner join resi_event re
+        on(p.ORIGIN_ID=re.id)
+        where pc.DEL_FLAG='0'
+        and p.DEL_FLAG='0'
+        and re.DEL_FLAG='0'
+        and pc.CUSTOMER_ID=#{customerId}
+        and p.ORIGIN='resi_event'
+        and pc.PROJECT_ID !=#{excludeProjectId}
+        <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
+            re.REPORT_USER_ID = #{epmetUserId}
+        </foreach>
+        and pc.CATEGORY_CODE like concat(#{categoryCode},'%')
+        order by p.CREATED_TIME desc
+    </select>
 </mapper>