Merge branch 'dev-lx' into dev

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/YearTaxSaveUpdateDto.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -81,8 +81,8 @@ public class HouseResourceController {
     }
 
     @PostMapping("/saveYearTax")
-    public AjaxResult postSaveYearTax(@RequestBody YearTaxSaveUpdateDto dto) {
-        houseResourceService.saveYearTax(dto);
+    public AjaxResult postSaveYearTax(@RequestBody List<YearTaxSaveUpdateDto> dtos) {
+        houseResourceService.saveYearTax(dtos);
         return AjaxResult.success();
     }
 }

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

@@ -9,5 +9,11 @@ public class YearTaxSaveUpdateDto {
 
     private String businessEntityInfoId;
 
+    private Integer year;
+
+    private BigDecimal yearSell;
+
     private BigDecimal yearTax;
+
+    private String compare;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

@@ -30,5 +30,5 @@ public interface HouseResourceService {
 
     PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(PageBusinessEntityStatisticsQuery query);
 
-    void saveYearTax(YearTaxSaveUpdateDto dto);
+    void saveYearTax(List<YearTaxSaveUpdateDto> dtos);
 }

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

@@ -436,12 +436,14 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public void saveYearTax(YearTaxSaveUpdateDto dto) {
+    public void saveYearTax(List<YearTaxSaveUpdateDto> dtos) {
+        for (YearTaxSaveUpdateDto dto : dtos) {
             BusinessEntitySell businessEntitySell = new BusinessEntitySell();
             BeanUtils.copyProperties(dto, businessEntitySell);
             businessEntitySell.setId(UUID.randomUUID().toString().replaceAll("-", ""));
             businessEntitySellMapper.insertBusinessEntitySell(businessEntitySell);
         }
+    }
 
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
         list.forEach(x -> {