From c64d9f4216b763d4a1e4a8d216353030c3d496e8 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sat, 6 May 2023 10:11:12 +0800
Subject: [PATCH] =?UTF-8?q?convertEntity2ResultDTOList()=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=8C=96=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-custom/src/main/resources/logback-spring.xml       | 1 +
 .../house/service/impl/HouseSaleRentServiceServiceImpl.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epdc-cloud-custom/src/main/resources/logback-spring.xml b/epdc-cloud-custom/src/main/resources/logback-spring.xml
index 2658a2b..d4b9ac1 100644
--- a/epdc-cloud-custom/src/main/resources/logback-spring.xml
+++ b/epdc-cloud-custom/src/main/resources/logback-spring.xml
@@ -141,6 +141,7 @@
         <logger name="com.elink.esua.epdc.modules.consult.dao" level="DEBUG"/>
         <logger name="com.elink.esua.epdc.vaccine.epidemic.dao" level="DEBUG"/>
         <logger name="com.elink.esua.epdc.vaccine.vim.dao" level="DEBUG"/>
+        <!--<logger name="com.elink.esua.epdc.vaccine.house.dao" level="DEBUG"/>-->
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java
index 8942b69..6df97f1 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java
@@ -39,6 +39,8 @@ public class HouseSaleRentServiceServiceImpl implements HouseSaleRentServiceServ
         return entities.stream().map(r -> {
             HouseSaleRentInfoListResultDTO rd = ConvertUtils.sourceToTarget(r, HouseSaleRentInfoListResultDTO.class);
             rd.setHouseStatusDisplay(HouseSaleRentStatusEnum.getEnumByType(r.getHouseStatus()).getDesc());
+            rd.setAuditStatusDisplay(HouseSaleRentAuditStatusEnum.getEnumByType(r.getAuditStatus()).getDesc());
+            rd.setPublishStatusDisplay(HouseSaleRentPublishStatusEnum.getEnumByType(r.getPublishStatus()).getDesc());
             if (StringUtils.isNotBlank(r.getPhotos())) {
                 rd.setPhotoList(JSON.parseArray(r.getPhotos(), String.class));
                 rd.setCreatedData(r.getCreatedTime());
@@ -107,7 +109,7 @@ public class HouseSaleRentServiceServiceImpl implements HouseSaleRentServiceServ
         HouseSaleRentInfoEntity e = new HouseSaleRentInfoEntity();
         e.setId(id);
         e.setAuditStatus(auditStatus);
-        if (HouseSaleRentAuditStatusEnum.ACCEPT.equals(auditStatus)) {
+        if (HouseSaleRentAuditStatusEnum.ACCEPT.getStatus().equals(auditStatus)) {
             // 如果是已通过，那么将其上架
             e.setPublishStatus(HouseSaleRentPublishStatusEnum.UP.getStatus());
         }