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 @@ + 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()); }