接口增加返参

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;

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;
     /**
      * 居民总数
      */

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()) {