Merge branch '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 List<YearTaxSaveUpdateDto> dtos) {
-        houseResourceService.saveYearTax(dtos);
+    public AjaxResult postSaveYearTax(@RequestBody YearTaxSaveUpdateDto dto) {
+        houseResourceService.saveYearTax(dto);
         return AjaxResult.success();
     }
 }

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

@@ -7,6 +7,8 @@ import java.math.BigDecimal;
 @Data
 public class YearTaxSaveUpdateDto {
 
+    private String id;
+
     private String businessEntityInfoId;
 
     private Integer year;

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(List<YearTaxSaveUpdateDto> dtos);
+    void saveYearTax(YearTaxSaveUpdateDto dto);
 }

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

@@ -436,8 +436,16 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public void saveYearTax(List<YearTaxSaveUpdateDto> dtos) {
-        for (YearTaxSaveUpdateDto dto : dtos) {
+    @Transactional(rollbackFor = Exception.class)
+    public void saveYearTax(YearTaxSaveUpdateDto dto) {
+        if (Objects.nonNull(dto.getId())) {
+            BusinessEntitySell existingSell = businessEntitySellMapper.selectBusinessEntitySellById(dto.getId());
+            if (existingSell == null) {
+                throw new RuntimeException("未找到对应的记录");
+            }
+            BeanUtils.copyProperties(dto, existingSell);
+            businessEntitySellMapper.updateBusinessEntitySell(existingSell);
+        } else {
             BusinessEntitySell businessEntitySell = new BusinessEntitySell();
             BeanUtils.copyProperties(dto, businessEntitySell);
             businessEntitySell.setId(UUID.randomUUID().toString().replaceAll("-", ""));