房屋信息

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/houseInfo/PropertySettingsController.java

@@ -2,7 +2,6 @@ package org.dromara.controller.houseInfo;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -99,8 +98,7 @@ public class PropertySettingsController extends BaseController {
     @SaCheckPermission("wuYe:feeSettings:remove")
     @Log(title = "物业费设置", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{settingsId}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long settingsId) {
+    public R<Void> remove(@PathVariable Long settingsId) {
         return toAjax(propertySettingsService.deleteWithValidByIds(settingsId, true));
     }
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/PropertySettings.java

@@ -27,6 +27,11 @@ public class PropertySettings extends TenantEntity {
     @TableId(value = "settings_id")
     private Long settingsId;
 
+    /**
+     * 房屋类型 普通住宅，洋房
+     */
+    private String houseType;
+
     /**
      * 应缴物业费用
      */

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/bo/PropertySettingsBo.java

@@ -25,6 +25,10 @@ public class PropertySettingsBo extends BaseEntity {
      */
     @NotNull(message = "物业费信息主键不能为空", groups = { EditGroup.class })
     private Long settingsId;
+    /**
+     * 房屋类型 普通住宅，洋房
+     */
+    private String houseType;
 
     /**
      * 应缴物业费用

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/vo/PropertySettingsVo.java

@@ -30,6 +30,10 @@ public class PropertySettingsVo implements Serializable {
      */
     @ExcelProperty(value = "物业费信息主键")
     private Long settingsId;
+    /**
+     * 房屋类型 普通住宅，洋房
+     */
+    private String houseType;
 
     /**
      * 应缴物业费用

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/PropertySettingsServiceImpl.java

@@ -71,6 +71,7 @@ public class PropertySettingsServiceImpl implements IPropertySettingsService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PropertySettings> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(PropertySettings::getSettingsId);
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseType()), PropertySettings::getHouseType, bo.getHouseType());
         lqw.eq(bo.getTenementExpense() != null, PropertySettings::getTenementExpense, bo.getTenementExpense());
         lqw.eq(bo.getParkingExpense() != null, PropertySettings::getParkingExpense, bo.getParkingExpense());
         lqw.eq(bo.getEnergyExpense() != null, PropertySettings::getEnergyExpense, bo.getEnergyExpense());