Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_grid_patrol

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.user.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
@@ -748,35 +749,34 @@ public class UserServiceImpl implements UserService {
     public void fillScreenProjectData(List<ScreenProjectDataDTO> list) {
         List<String> topicUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(o.getOrigin()))
                 .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(topicUserIdList)){
+        Map<String, ScreenProjectDataDTO> topicUserMap = new HashMap<>();
-            return;
+        if (!CollectionUtils.isEmpty(topicUserIdList)){
+            List<ScreenProjectDataDTO> collection = userDao.selectScreenProjectData(topicUserIdList);
+            logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(collection),topicUserIdList);
+            topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
         }
-        List<ScreenProjectDataDTO> collection = userDao.selectScreenProjectData(topicUserIdList);
+
-        Map<String, ScreenProjectDataDTO> topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
+
-       /* if(!CollectionUtils.isEmpty(collection)){
-            list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId()))
-            .map(merge -> {
-                target.setLinkName(merge.getLinkName());
-                target.setLinkMobile(merge.getLinkMobile());
-                return target;}));
-        }*/
         List<String> staffUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(o.getOrigin()))
                 .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(topicUserIdList)){
+
-            return;
+        Map<String, ScreenProjectDataDTO> staffMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(staffUserIdList)){
+            List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList);
+            logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList);
+            staffMap = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
         }
-        List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList);
+
-        Map<String, ScreenProjectDataDTO> collect = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
+        for (ScreenProjectDataDTO project : list) {
-        list.forEach(project->{
+            ScreenProjectDataDTO userDTO = staffMap.get(project.getLinkName());
-            ScreenProjectDataDTO userDTO = collect.get(project.getLinkName());
+            if (userDTO == null) {
-            if (userDTO == null){
                 userDTO = topicUserMap.get(project.getLinkName());
             }
-            if (userDTO != null){
+            if (userDTO != null) {
                 project.setLinkName(userDTO.getLinkName());
                 project.setLinkMobile(userDTO.getLinkMobile());
             }
-        });
+        }
     }
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -235,12 +235,13 @@
         <foreach collection="list" item="l" separator=" UNION ALL ">
             SELECT
             #{l.projectId} AS projectId,
-            CATEGORY_NAME
+            CONCAT(if(cd2.CATEGORY_CODE = '0','',CONCAT(cd2.CATEGORY_NAME,'-')),cd.CATEGORY_NAME) AS categoryName
-            FROM issue_project_category_dict
+            FROM issue_project_category_dict cd
-            WHERE DEL_FLAG = '0'
+            LEFT JOIN issue_project_category_dict cd2 ON cd2.CATEGORY_CODE = cd.PARENT_CATEGORY_CODE AND cd2.DEL_FLAG = '0' AND cd2.CUSTOMER_ID = #{customerId}
-            AND IS_DISABLE = 'enable'
+            WHERE cd.DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
+            AND cd.IS_DISABLE = 'enable'
-            AND CATEGORY_CODE = #{l.categoryCode}
+            AND cd.CUSTOMER_ID = #{customerId}
+            AND cd.CATEGORY_CODE = #{l.categoryCode}
         </foreach>
     </select>
 

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

@@ -38,6 +38,7 @@ import com.epmet.dto.result.MassesDiscontentResultDTO;
 import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
 import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.dto.result.ProjectScoreResultDTO;
+import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectSatisfactionStatisticsRedis;
@@ -138,6 +139,11 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
      */
     @Override
     public ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO) {
+        ProjectEntity projectEntity = projectDao.selectById(formDTO.getProjectId());
+        if (projectEntity.getOrigin().equals(ProjectConstant.AGENCY)){
+            // 直接立项的项目不能评价，所以给0分
+            return new ProjectEvaluateScoreResultDTO(NumConstant.EIGHTY);
+        }
         ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());
         Integer realEvalCount  = entity.getBadCount() + entity.getGoodCount() + entity.getPerfectCount();
         Integer shouldEvaluateCount = entity.getShouldEvaluateCount();