fix: 修复不动产出租接口错误

src/main/java/com/example/dao/house/HouseRentInDao.java

@@ -236,7 +236,7 @@ where
   </otherwise>
 </choose>
 order by
-    unit_price desc nulls last
+    unit_price2 desc nulls last
 limit 10
 )
 select * from t101
@@ -261,7 +261,7 @@ with
 t101 as (
 select
     use_type,
-    round(avg(unit_price),
+    round(avg(unit_price2),
     2) as unit_price_avg
 from
     house.rent_in_month
@@ -293,11 +293,11 @@ select
     a.building_area,
     a.rent_months,
     a.rent_years,
-    a.unit_price,
+    a.unit_price2 as unit_price,
     b.unit_price_avg,
     case
         when b.unit_price_avg = 0 then null
-        else round(a.unit_price / b.unit_price_avg,
+        else round(a.unit_price2 / b.unit_price_avg,
         2)
     end as unit_price_compare
 from

src/main/java/com/example/enums/ListRentInTopOrderEnum.java

@@ -48,7 +48,7 @@ public enum ListRentInTopOrderEnum {
     /**
      * 每平米月租金
      */
-    totalMonthlyRent("unit_price"),
+    totalMonthlyRent("unit_price2"),
     /**
      * 合同编号
      */

src/main/java/com/example/pojo/po/house/RentInMonthPo.java

@@ -262,6 +262,10 @@ public class RentInMonthPo {
      * 每平米单价
      */
     private BigDecimal unitPrice;
+    /**
+     * 每平米单价，租期年/12
+     */
+    private BigDecimal unitPrice2;
 
     /**
      * 租期年

src/main/java/com/example/pojo/vo/ListRentInTopVo.java

@@ -51,7 +51,7 @@ public class ListRentInTopVo {
         this.contractAmountIncludingTax = po.getGrossAmount();
         this.rentalBuildingArea = po.getBuildingArea();
         this.hireTime = po.getRentYears();
-        this.totalMonthlyRent = po.getUnitPrice();
+        this.totalMonthlyRent = po.getUnitPrice2();
         this.contractNumber = po.getContractNo();
         this.contractName = po.getContractName();
     }

src/main/java/com/example/service/house/HouseBuildManageDetailsService.java

@@ -7,10 +7,6 @@ import com.example.common.PageVo;
 import com.example.common.Rsp;
 import com.example.dao.gdc.WzOtnAreaDao;
 import com.example.dao.house.HouseBuildingDao;
-import com.example.pojo.po.house.BuildingIdleStatPo;
-import com.example.pojo.po.house.HouseAgeStatPo;
-import com.example.pojo.po.house.HouseBuildingPo;
-import com.example.pojo.po.house.HouseSitePo;
 import com.example.enums.ListBuildingIdleOrderEnum;
 import com.example.enums.ListBuildingOrderEnum;
 import com.example.enums.OrderEnum;
@@ -25,6 +21,10 @@ import com.example.pojo.dto.ListBuildingDto;
 import com.example.pojo.dto.ListBuildingIdleDto;
 import com.example.pojo.dto.ListSiteNameDto;
 import com.example.pojo.dto.ListSiteNumDto;
+import com.example.pojo.po.house.BuildingIdleStatPo;
+import com.example.pojo.po.house.HouseAgeStatPo;
+import com.example.pojo.po.house.HouseBuildingPo;
+import com.example.pojo.po.house.HouseSitePo;
 import com.example.pojo.vo.BuildingIdleStatVo;
 import com.example.pojo.vo.HouseAgeStatVo;
 import com.example.pojo.vo.ListBuildingIdleVo;
@@ -45,6 +45,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -818,6 +819,9 @@ public class HouseBuildManageDetailsService {
         for (HouseAgeStatPo value : secondUnitPoMap.values()) {
             firstUnitPo.update(value);
         }
+        if (firstUnitPo.getTotal().equals(0)) {
+            return null;
+        }
         return firstUnitPo;
     }
 
@@ -1107,6 +1111,9 @@ public class HouseBuildManageDetailsService {
         for (BuildingIdleStatPo value : secondUnitPoMap.values()) {
             firstUnitPo.update(value);
         }
+        if (firstUnitPo.getBuildingAreaSum().compareTo(BigDecimal.ZERO) == 0) {
+            return null;
+        }
         return firstUnitPo;
     }
 

src/main/java/com/example/service/house/HouseContractTopService.java

@@ -180,8 +180,8 @@ public class HouseContractTopService {
             zqCell.setCellStyle(numberCellStyle);
             // 每平米月租金
             Cell unitPriceCell = row.createCell(columnIndex.getAndIncrement());
-            if (po.getUnitPrice() != null) {
-                unitPriceCell.setCellValue(po.getUnitPrice().doubleValue());
+            if (po.getUnitPrice2() != null) {
+                unitPriceCell.setCellValue(po.getUnitPrice2().doubleValue());
             }
             unitPriceCell.setCellStyle(numberCellStyle);
             // 合同编号

src/main/java/com/example/service/house/HouseLandManageDetailsService.java

@@ -37,6 +37,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -130,6 +131,9 @@ public class HouseLandManageDetailsService {
         for (LandIdleStatPo value : secondUnitPoMap.values()) {
             firstUnitPo.update(value);
         }
+        if (firstUnitPo.getTotalLandAreaSum().compareTo(BigDecimal.ZERO) == 0) {
+            return null;
+        }
         return firstUnitPo;
     }
 

src/main/java/com/example/service/house/HouseLeaseInConService.java

@@ -95,6 +95,9 @@ public class HouseLeaseInConService {
         for (RentInContractStatPo value : secondUnitPoMap.values()) {
             firstUnitPo.update(value);
         }
+        if (firstUnitPo.getTotal().equals(0)) {
+            return null;
+        }
         return firstUnitPo;
     }
 

src/main/java/com/example/service/house/HouseUseService.java

@@ -81,6 +81,9 @@ public class HouseUseService {
         for (RentInUseStatPo value : secondUnitPoMap.values()) {
             firstUnitPo.update(value);
         }
+        if (firstUnitPo.getZj().equals(0)) {
+            return null;
+        }
         return firstUnitPo;
     }
 

src/main/resources/com/example/dao/gdc/WzStrategyDao.xml

@@ -26,13 +26,6 @@
              where id = #{id}
     </delete>
 
-    <delete id="delById">
-        delete
-             from house_theme.wz_f_strategy
-             where id = #{id}
-    </delete>
-
-
     <select id="queryList" resultType="com.example.pojo.gdc.WzStrategyEntity">
         select
             id,