From 69ea031be5c01436330181fad729f76cb02400b9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 9 Jul 2020 10:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=94=E5=9B=9E=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PropertyProjectServiceImpl.java      | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java
index c0dff57..810e6c3 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java
@@ -28,17 +28,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
-import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
-import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
-import com.elink.esua.epdc.smile.dto.group.GroupDTO;
-import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO;
-import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
-import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
-import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
 import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.smile.feign.EventFeignClient;
 import com.elink.esua.epdc.modules.smile.group.dao.GroupDao;
@@ -50,6 +39,17 @@ import com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity;
 import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService;
 import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
+import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
+import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
+import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.smile.dto.group.GroupDTO;
+import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import io.netty.util.internal.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -161,7 +161,6 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
         groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
         groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
         groupEntity.setGroupName(entity.getProjectName() + "群");
-//        groupEntity.setGroupCategory(GroupConstant.PROPERTY_GROUP_CATEGORY);
         groupEntity.setSectionCode(GroupConstant.PROPERTY_GROUP_SECTION);
         groupEntity.setCategoryCode(GroupConstant.PROPERTY_GROUP_CATEGORY_CODE);
         groupEntity.setTypeKey(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY);
@@ -226,19 +225,10 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
             scoreFormDTO.setProjectId(dto.getId());
             String score = propertyProjectScoreDao.selectScoreByIdV2(scoreFormDTO);
             String avaScore = propertyProjectScoreDao.selectAvaScore(scoreFormDTO);
-            // 如果没有打分情况，赋""表示未打分
-            if (score == null) {
-                projectDetailResultDTO.setUserScore("");
-            } else {
-                // 处理mysql sum后出现的,0
-                projectDetailResultDTO.setUserScore(score.replace(".0", ""));
-            }
-            // 如果没有打分情况，赋""表示没有平均分
-            if (avaScore == null) {
-                projectDetailResultDTO.setAvaScore("");
-            }
-
+            projectDetailResultDTO.setUserScore(StringUtil.isNullOrEmpty(score) ? "" : score);
+            projectDetailResultDTO.setAvaScore(StringUtil.isNullOrEmpty(avaScore) ? "" : avaScore);
         }
+
         return projectDetailResultDTO;
     }