From 065d02a126fc9b58a1e38037750865c6f0d4f14a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Jun 2022 10:28:26 +0800
Subject: [PATCH] latestResultName

---
 .../epmet/dto/result/EnterpriseDetailDTO.java |  4 ++++
 .../service/impl/IcEnterpriseServiceImpl.java | 19 ++++++++++++-------
 .../main/resources/mapper/IcEnterpriseDao.xml |  6 ++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java
index f42ea2303e..2d787ab00f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java
@@ -99,6 +99,10 @@ public class EnterpriseDetailDTO implements Serializable {
      */
     private String latestResult;
 
+    /**
+     * 最新巡查结果【0:合格 1:不合格】
+     */
+    private String latestResultName;
     /**
      * 最新检查时间
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
index 310975f045..6bacf2fc50 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
@@ -166,23 +166,28 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
      */
     @Override
     public EnterpriseDetailDTO queryEnterpriseDetail(String customerId, String enterpriseId) {
-        IcEnterpriseEntity enterpriseEntity=baseDao.selectById(enterpriseId);
-        if(null==enterpriseEntity){
+        IcEnterpriseEntity enterpriseEntity = baseDao.selectById(enterpriseId);
+        if (null == enterpriseEntity) {
             return null;
         }
-        EnterpriseDetailDTO resultDto=ConvertUtils.sourceToTarget(enterpriseEntity,EnterpriseDetailDTO.class);
+        EnterpriseDetailDTO resultDto = ConvertUtils.sourceToTarget(enterpriseEntity, EnterpriseDetailDTO.class);
         resultDto.setEnterpriseId(enterpriseId);
-        GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(resultDto.getGridId());
+        GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resultDto.getGridId());
         if (null != gridInfoCache) {
             resultDto.setGridName(gridInfoCache.getGridName());
             resultDto.setAgencyName(gridInfoCache.getAgencyName());
         }
-        String placeTypeName=coverageCategoryDictDao.selectCategoryName(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode(),resultDto.getPlaceType());
+        String placeTypeName = coverageCategoryDictDao.selectCategoryName(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode(), resultDto.getPlaceType());
         resultDto.setPlaceTypeName(placeTypeName);
         //规模名称
-        Result<Map<String, String>> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
+        Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
         Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
-        resultDto.setScaleName(dictMap.containsKey(resultDto.getScale())?dictMap.get(resultDto.getScale()):StrConstant.EPMETY_STR);
+        resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR);
+        if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "0".equals(enterpriseEntity.getLatestResult())) {
+            resultDto.setLatestResultName("合格");
+        } else if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "1".equals(enterpriseEntity.getLatestResult())) {
+            resultDto.setLatestResultName("不合格");
+        }
         return resultDto;
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
index 3d972d79f9..d17a9b1d75 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
@@ -52,6 +52,12 @@
             ie.MOBILE,
             ie.SOURCE_TYPE,
             ie.LATEST_RESULT,
+            (
+            case when ie.LATEST_RESULT ='0'then '合格'
+            when ie.LATEST_RESULT='1' then '不合格'
+            else ''
+            end
+        )as latestResultName,
             ie.LATEST_PATROL_TIME
         FROM
             ic_enterprise ie