From 28795cfd31ba9d56d3660d79e75abc5813b98f86 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Jun 2021 15:30:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IssueProjectCategoryDictDao.xml          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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..05e72af022 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 @@
         <foreach collection="list" item="l" separator=" UNION ALL ">
             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'
+            WHERE cd.DEL_FLAG = '0'
+            AND cd.IS_DISABLE = 'enable'
+            AND cd.CUSTOMER_ID = #{customerId}
+            AND cd.CATEGORY_CODE = #{l.categoryCode}
         </foreach>
     </select>
 

From 9a7fcd3b8241c294e96bc1527bef21d20113a028 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Jun 2021 16:43:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 05e72af022..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
@@ -237,7 +237,7 @@
             #{l.projectId} AS projectId,
             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'
+            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}

From 4a406602538a3b32398839f81df582ef48c3350f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 10 Jun 2021 14:01:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=990=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectSatisfactionStatisticsServiceImpl.java      | 6 ++++++
 1 file changed, 6 insertions(+)

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..d36c39b6d6 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<Pr
      */
     @Override
     public ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO) {
+        ProjectEntity projectEntity = projectDao.selectById(formDTO.getProjectId());
+        if (projectEntity.getOrigin().equals(ProjectConstant.AGENCY)){
+            // 直接立项的项目不能评价，所以给0分
+            return new ProjectEvaluateScoreResultDTO(NumConstant.ZERO);
+        }
         ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());
         Integer realEvalCount  = entity.getBadCount() + entity.getGoodCount() + entity.getPerfectCount();
         Integer shouldEvaluateCount = entity.getShouldEvaluateCount();

From bb50edf9ccd0486b656ee3c25a6e0cb193c822ba Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 10 Jun 2021 14:04:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?made=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=BB=9980?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectSatisfactionStatisticsServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d36c39b6d6..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
@@ -142,7 +142,7 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
         ProjectEntity projectEntity = projectDao.selectById(formDTO.getProjectId());
         if (projectEntity.getOrigin().equals(ProjectConstant.AGENCY)){
             // 直接立项的项目不能评价，所以给0分
-            return new ProjectEvaluateScoreResultDTO(NumConstant.ZERO);
+            return new ProjectEvaluateScoreResultDTO(NumConstant.EIGHTY);
         }
         ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());
         Integer realEvalCount  = entity.getBadCount() + entity.getGoodCount() + entity.getPerfectCount();