Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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();