screen_project_data分类名称、项目分类id接口调整。

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.*;
 import com.epmet.entity.issue.IssueEntity;
 import com.epmet.service.Issue.IssueService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -26,6 +27,7 @@ import java.util.Set;
  * @dscription
  * @date 2020/6/17 16:02
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.GOV_ISSUE)
 public class IssueServiceImpl implements IssueService {
@@ -162,8 +164,11 @@ public class IssueServiceImpl implements IssueService {
 			List<IssueProjectCategoryDictDTO> categories = statsIssueDao.selectCategory(customerId, categoryIds);
 			if(!CollectionUtils.isEmpty(categories)){
 				StringBuilder str = new StringBuilder();
-				categories.forEach(category -> {str.append(category.getCategoryName()).append(StrConstant.COMMA);});
-				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.TWO));
+				categories.forEach(category -> {
+					str.append(category.getCategoryName()).append(StrConstant.COMMA);
+					//log.info(str.toString());
+				});
+				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.ONE));
 			}
 		});
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -127,6 +127,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 		if(!CollectionUtils.isEmpty(orientData)) {
 			projectIds.addAll(orientData.stream().map(ScreenProjectDataDTO::getProjectId).distinct().collect(Collectors.toList()));
 		}
+		projectIds.clear();
+		projectIds.add("18759f2fb5c5fb8513c4a21b0be81834");
 		Map<String, Set<String>> categoryMap = projectService.getProjectCategory(projectIds);
 		if(!CollectionUtils.isEmpty(categoryMap)){
 			Map<String, String> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId());
@@ -139,7 +141,9 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 				});
 			}
 		}
-
+		if(projectIds.contains("4f670b349899b33c20e888e77842d938")){
+			return;
+		}
 		//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 //		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
 		//todo 与上面重复处理 暂时注释掉

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

@@ -5,7 +5,7 @@
 
     <select id="selectProjectCategoryIdList" resultType="java.lang.String">
         SELECT
-            category_id
+            distinct category_id
         FROM
             project_category
         WHERE
@@ -38,8 +38,8 @@
     <!-- 根据项目ID查询项目分类 -->
     <select id="selectCategoryByIds" resultType="com.epmet.dto.result.ProjectCategoryDisPoseResultDTO">
         SELECT
+            distinct CATEGORY_CODE,
             PROJECT_ID,
-            CATEGORY_CODE,
             CUSTOMER_ID
         FROM project_category
         WHERE DEL_FLAG = '0'