diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 4a7b073b73..dca01a63f5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -235,12 +235,13 @@ SELECT #{l.projectId} AS projectId, - CATEGORY_NAME - FROM issue_project_category_dict - WHERE DEL_FLAG = '0' - AND IS_DISABLE = 'enable' - AND CUSTOMER_ID = #{customerId} - AND CATEGORY_CODE = #{l.categoryCode} + CONCAT(if(cd2.CATEGORY_CODE = '0','',CONCAT(cd2.CATEGORY_NAME,'-')),cd.CATEGORY_NAME) AS categoryName + FROM issue_project_category_dict cd + 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} + WHERE cd.DEL_FLAG = '0' + AND cd.IS_DISABLE = 'enable' + AND cd.CUSTOMER_ID = #{customerId} + AND cd.CATEGORY_CODE = #{l.categoryCode} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java index 119f217c14..f3925108f3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java +++ b/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