feat: 到处增加年度税收字段

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceExport.java

@@ -84,6 +84,12 @@ public class HouseResourceExport {
     @Excel(name = "2025营收")
     private BigDecimal YearSell2025;
 
+    @Excel(name = "2024税收")
+    private BigDecimal YearTax2024;
+
+    @Excel(name = "2025税收")
+    private BigDecimal YearTax2025;
+
     @Excel(name = "经营(办公)场所图片")
     private String houseResourceUrl;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePage.java

@@ -133,4 +133,8 @@ public class HouseResourcePage {
     private BigDecimal YearSell2024;
 
     private BigDecimal YearSell2025;
+
+    private BigDecimal YearTax2024;
+
+    private BigDecimal YearTax2025;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/BusinessEntitySellMapper.java

@@ -30,4 +30,5 @@ public interface BusinessEntitySellMapper {
 
     BusinessEntitySell selectBusinessEntitySellByBusinessEntityInfoId(@Param("businessEntityInfoId") String businessEntityInfoId, @Param("year") Integer year);
 
+    BusinessEntitySell selectBusinessEntityTaxByBusinessEntityInfoId(@Param("businessEntityInfoId") String businessEntityInfoId, @Param("year") Integer year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -423,6 +423,18 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     x.setYearSell2025(businessEntitySell2025.getYearSell());
                 }
             }
+            BusinessEntitySell businessEntityTax2024 = businessEntitySellMapper.selectBusinessEntityTaxByBusinessEntityInfoId(x.getBusinessEntityInfoId(), 2024);
+            if (Objects.nonNull(businessEntityTax2024)) {
+                if (Objects.nonNull(businessEntityTax2024.getYearTax())) {
+                    x.setYearTax2024(businessEntityTax2024.getYearTax());
+                }
+            }
+            BusinessEntitySell businessEntityTax2025 = businessEntitySellMapper.selectBusinessEntityTaxByBusinessEntityInfoId(x.getBusinessEntityInfoId(), 2025);
+            if (Objects.nonNull(businessEntityTax2025)) {
+                if (Objects.nonNull(businessEntityTax2025.getYearTax())) {
+                    x.setYearTax2025(businessEntityTax2025.getYearTax());
+                }
+            }
         });
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

ruoyi-system/src/main/resources/mapper/house/BusinessEntitySellMapper.xml

@@ -69,4 +69,14 @@
         WHERE t1.id = #{businessEntityInfoId} AND t2.year = #{year}
         limit 1
     </select>
+    <select id="selectBusinessEntityTaxByBusinessEntityInfoId"
+            resultType="com.ruoyi.system.domain.house.BusinessEntitySell">
+        SELECT
+            t2.*
+        FROM
+            business_entity_info t1
+                LEFT JOIN business_entity_sell t2 ON t1.id = t2.business_entity_info_id
+        WHERE t1.id = #{businessEntityInfoId} AND t2.year = #{year}
+            limit 1
+    </select>
 </mapper>