From da12d790fdff0af31f09ece9f0d9d3815c767e2c Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 7 Sep 2022 10:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/HouseChartResultDTO.java    | 8 ++++++++
 .../com/epmet/dto/result/SubUserHouseListResultDTO.java   | 8 ++++++++
 .../java/com/epmet/service/impl/HouseServiceImpl.java     | 7 ++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
index aed43f1b0c..61bee2a9cc 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
@@ -47,6 +47,14 @@ public class HouseChartResultDTO implements Serializable {
      * 房屋闲置总数占比（保留两位小数，带百分号的）
      */
     private Double xzHouseRatio = 0.0;
+    /**
+     * 房屋未售出总数
+     */
+    private Integer wscHouseTotal = 0;
+    /**
+     * 房屋未售出总数占比（保留两位小数，带百分号的）
+     */
+    private Double wscHouseRatio = 0.0;
 
     @JsonIgnore
     private Integer num;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java
index 905dca051f..45ded6601b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java
@@ -50,6 +50,14 @@ public class SubUserHouseListResultDTO implements Serializable {
      * 房屋闲置总数占比（保留两位小数，带百分号的）
      */
     private Double xzHouseRatio = 0.0;
+    /**
+     * 房屋未售出总数
+     */
+    private Integer wscHouseTotal = 0;
+    /**
+     * 房屋未售出总数占比（保留两位小数，带百分号的）
+     */
+    private Double wscHouseRatio = 0.0;
     /**
      * 居民总数
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 933a07daeb..f804a10b48 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -703,14 +703,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                 resultDTO.setZzHouseTotal(l.getNum());
             } else if (l.getRentFlag() == 1) {
                 resultDTO.setCzHouseTotal(l.getNum());
-            } else {
+            } else if (l.getRentFlag() == 2) {
                 resultDTO.setXzHouseTotal(l.getNum());
+            } else if (l.getRentFlag() == 3) {
+                resultDTO.setWscHouseTotal(l.getNum());
             }
         });
         resultDTO.setHouseTotal(houseTotal.get());
         resultDTO.setZzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getZzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getZzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100)));
         resultDTO.setCzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getCzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getCzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100)));
         resultDTO.setXzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getXzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getXzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100)));
+        resultDTO.setWscHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getWscHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getWscHouseTotal() / (float) resultDTO.getHouseTotal()) * 100)));
         resultDTO.setOrgId(formDTO.getOrgId());
         resultDTO.setOrgType(formDTO.getOrgType());
         return resultDTO;
@@ -946,6 +949,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                     dto.setCzHouseRatio(h.getCzHouseRatio());
                     dto.setXzHouseTotal(h.getXzHouseTotal());
                     dto.setXzHouseRatio(h.getXzHouseRatio());
+                    dto.setWscHouseTotal(h.getWscHouseTotal());
+                    dto.setWscHouseRatio(h.getWscHouseRatio());
                 }
             }
             for (UserChartResultDTO u : userResult.getData()) {