zancun

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java

@@ -3,17 +3,10 @@ package com.epmet.dataaggre.dto.govproject.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Set;
 
 @Data
 public class IssueProjectCategory implements Serializable {
     private static final long serialVersionUID = -2226298165882293959L;
     private String issueId;
     private String projectId;
-    private Set<String> categoryPidsList;
-
-    /**
-     * 这个项目对应的所有一级项目分类编码
-     */
-    private Set<String> firstCategoryCodeList;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java

@@ -5,8 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * 个人分析，发布话题分页列表
@@ -21,6 +19,4 @@ public class UserTopicResDTO implements Serializable {
     private String issueId;
     private Boolean shiftProject=false;
     private String projectId="";
-    //不返给前端了。
-    private Set<String> projectFirstCategoryCodeList=new HashSet<>();
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.dataaggre.service.govproject.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -13,7 +12,6 @@ import com.epmet.dataaggre.constant.ProjectConstant;
 import com.epmet.dataaggre.dao.govproject.ProjectDao;
 import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory;
 import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
@@ -394,27 +392,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 */
 	@Override
 	public List<IssueProjectCategory> getIssueProjectFirstCategory(List<String> issueIds) {
-		List<IssueProjectCategory> list=projectDao.selectProjectIssueCategory(issueIds);
-		if(CollectionUtils.isNotEmpty(list)){
-			for(IssueProjectCategory projectCategory:list){
-				Set<String> firt=new HashSet<>();
-				for(String pids:projectCategory.getCategoryPidsList()){
-					if(pids.contains(StrConstant.COLON)){
-						String[] pidAtt=pids.split(StrConstant.COLON);
-						firt.add(pidAtt[0]);
-						break;
-					}
-					if(pids.contains(StrConstant.COMMA)){
-						String[] pidAtt=pids.split(StrConstant.COMMA);
-						firt.add(pidAtt[0]);
-						break;
-					}
-					firt.add(pids);
-				}
-				projectCategory.setFirstCategoryCodeList(firt);
-			}
-		}
-		return list;
+		return projectDao.selectProjectIssueCategory(issueIds);
 	}
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -385,13 +385,10 @@ public class ResiGroupServiceImpl implements ResiGroupService {
                 topicResDTO.setShiftProject(false);
                 topicResDTO.setProjectId(StrConstant.EPMETY_STR);
 
-                topicResDTO.setProjectFirstCategoryCodeList(new HashSet<>());
                 for(IssueProjectCategory category:categoryList){
-                    if(StringUtils.isNotBlank(category.getProjectId())){
+                    if(topicResDTO.getIssueId().equals(category.getIssueId())&&StringUtils.isNotBlank(category.getProjectId())){
                         topicResDTO.setShiftProject(true);
                         topicResDTO.setProjectId(category.getProjectId());
-
-                        topicResDTO.setProjectFirstCategoryCodeList(category.getFirstCategoryCodeList());
                         break;
                     }
                 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -174,21 +174,12 @@
         ORDER BY created_time DESC
     </select>
 
-    <resultMap id="IssueProjectCategoryMap" type="com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory">
-        <id property="issueId" column="issueId" />
-        <result property="projectId" column="projectId"/>
-        <collection property="categoryPidsList" ofType="java.util.Set" >
-        </collection>
-    </resultMap>
-    <select id="selectProjectIssueCategory" parameterType="map" resultMap="IssueProjectCategoryMap">
+    <select id="selectProjectIssueCategory" parameterType="map" resultType="com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory">
         SELECT
             p.ORIGIN_ID AS issueId,
-            p.id AS projectId,
-            pc.CATEGORY_PIDS
+            p.id AS projectId
         FROM
             project p
-        inner join project_category pc
-        on(p.id=pc.PROJECT_ID and pc.DEL_FLAG='0')
         WHERE
             p.DEL_FLAG = '0'
         <foreach item="issueId" collection="issueIds" separator="OR" open="AND (" close=")" index="">