物业代码定版

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java

@@ -1,6 +1,6 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,13 +18,13 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tb_building")
-public class TbBuilding extends BaseEntity {
+public class TbBuilding extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * id
+     * 
      */
     @TableId(value = "id")
     private Long id;
@@ -132,7 +132,7 @@ public class TbBuilding extends BaseEntity {
     /**
      * 排序字段
      */
-    private Long order;
+    private Long sort;
 
     /**
      * 组织编码
@@ -144,15 +144,15 @@ public class TbBuilding extends BaseEntity {
      */
     private Long dataState;
 
-    /**
-     * 创建人
-     */
-    private Long createEmpId;
-
     /**
      * 修改时间
      */
     private Date modifyTime;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java

@@ -4,10 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.common.translation.constant.TransConstant;
 
 import java.io.Serial;
 

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCityArea.java

@@ -1,6 +1,6 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +17,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tb_city_area")
-public class TbCityArea extends BaseEntity {
+public class TbCityArea extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -68,5 +68,10 @@ public class TbCityArea extends BaseEntity {
      */
     private Long dataState;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java

@@ -1,6 +1,6 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,13 +20,13 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tb_community")
-public class TbCommunity extends BaseEntity {
+public class TbCommunity extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键id
+     * 主键
      */
     @TableId(value = "id")
     private Long id;
@@ -91,15 +91,15 @@ public class TbCommunity extends BaseEntity {
      */
     private Long dataState;
 
-    /**
-     * 创建人
-     */
-    private Long createEmpId;
-
     /**
      * 修改时间
      */
     private Date modifyTime;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java

@@ -1,6 +1,6 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,13 +18,13 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tb_e8_config")
-public class TbE8Config extends BaseEntity {
+public class TbE8Config extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * ID
+     * 主键
      */
     @TableId(value = "id")
     private Long id;
@@ -54,15 +54,15 @@ public class TbE8Config extends BaseEntity {
      */
     private Long dataState;
 
-    /**
-     * 创建人
-     */
-    private Long createEmpId;
-
     /**
      * 修改时间
      */
     private Date modifyTime;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java

@@ -4,8 +4,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -24,7 +22,7 @@ public class TbFloor extends TenantEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     * ID
      */
     @TableId(value = "id")
     private Long id;
@@ -59,16 +57,6 @@ public class TbFloor extends TenantEntity {
      */
     private Long dataState;
 
-    /**
-     * 创建人
-     */
-    private Long createEmpId;
-
-    /**
-     * 修改时间
-     */
-    private Date modifyTime;
-
     /**
      * 搜索值
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdDeviceType.java

@@ -1,11 +1,9 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -18,13 +16,13 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("td_device_type")
-public class TdDeviceType extends BaseEntity {
+public class TdDeviceType extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 数据库id
+     * 主键
      */
     @TableId(value = "id")
     private Long id;
@@ -55,9 +53,9 @@ public class TdDeviceType extends BaseEntity {
     private Long dataState;
 
     /**
-     * 修改时间
+     * 搜索值
      */
-    private Date modifyTime;
+    private String searchValue;
 
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java

@@ -1,11 +1,9 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -18,13 +16,13 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("td_factory")
-public class TdFactory extends BaseEntity {
+public class TdFactory extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 数据库id
+     * 
      */
     @TableId(value = "id")
     private Long id;
@@ -50,9 +48,9 @@ public class TdFactory extends BaseEntity {
     private Long dataState;
 
     /**
-     * 修改时间
+     * 搜索值
      */
-    private Date modifyTime;
+    private String searchValue;
 
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java

@@ -23,8 +23,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class TbBuildingBo extends BaseEntity {
 
     /**
-     * id
+     * 
      */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -150,8 +151,7 @@ public class TbBuildingBo extends BaseEntity {
     /**
      * 排序字段
      */
-    @NotNull(message = "排序字段不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sort;
-    private Long order;
 
     /**
      * 组织编码
@@ -159,5 +159,20 @@ public class TbBuildingBo extends BaseEntity {
     @NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String orgCode;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    private Long dataState;
+
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialServeBo.java

@@ -8,10 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.common.translation.constant.TransConstant;
 
 /**
  * 会议服务业务对象 tb_ceremonial_serve
@@ -27,6 +25,7 @@ public class TbCeremonialServeBo extends BaseEntity {
     /**
      * id
      */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -83,16 +82,20 @@ public class TbCeremonialServeBo extends BaseEntity {
     @NotNull(message = "服务总价格不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long servePrice;
 
+    /**
+     * 数据状态（模拟删除 0:删除 1:未删除）
+     */
+    @NotNull(message = "数据状态（模拟删除 0:删除 1:未删除）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long dataStauts;
+
     /**
      * 产品图片
      */
-    @NotBlank(message = "产品图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serveImage;
 
     /**
      * 排序
      */
-    @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long sort;
 
 

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCityAreaBo.java

@@ -24,6 +24,7 @@ public class TbCityAreaBo extends BaseEntity {
     /**
      * 主键ID
      */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -68,5 +69,11 @@ public class TbCityAreaBo extends BaseEntity {
     @NotBlank(message = "维度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String lat;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long dataState;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java

@@ -25,8 +25,9 @@ import org.dromara.common.translation.constant.TransConstant;
 public class TbCommunityBo extends BaseEntity {
 
     /**
-     * 主键id
+     * 主键
      */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -97,7 +98,13 @@ public class TbCommunityBo extends BaseEntity {
     /**
      * 数据状态：1有效，0无效
      */
+    @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dataState;
 
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbE8ConfigBo.java

@@ -23,8 +23,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class TbE8ConfigBo extends BaseEntity {
 
     /**
-     * ID
+     * 主键
      */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -54,6 +55,7 @@ public class TbE8ConfigBo extends BaseEntity {
     /**
      * 数据状态：1有效，0无效
      */
+    @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dataState;
 
 

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java

@@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 楼层管理业务对象 tb_floor
@@ -23,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class TbFloorBo extends BaseEntity {
 
     /**
-     * 
+     * ID
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -63,20 +61,5 @@ public class TbFloorBo extends BaseEntity {
      */
     private Long dataState;
 
-    /**
-     * 创建人
-     */
-    private Long createEmpId;
-
-    /**
-     * 修改时间
-     */
-    private Date modifyTime;
-
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdDeviceTypeBo.java

@@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 设备类型业务对象 td_device_type
@@ -23,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class TdDeviceTypeBo extends BaseEntity {
 
     /**
-     * 数据库id
+     * 主键
      */
-    @NotNull(message = "数据库id不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java

@@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 厂商管理业务对象 td_factory
@@ -23,14 +21,15 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class TdFactoryBo extends BaseEntity {
 
     /**
-     * 数据库id
+     * 
      */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 厂商编码
      */
-    @NotBlank(message = "厂商编码不能为空", groups = { EditGroup.class })
+    @NotBlank(message = "厂商编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String factoryNo;
 
     /**
@@ -50,5 +49,10 @@ public class TdFactoryBo extends BaseEntity {
     @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dataState;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java

@@ -31,9 +31,9 @@ public class TbBuildingVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * id
+     * 
      */
-    @ExcelProperty(value = "id")
+    @ExcelProperty(value = "")
     private Long id;
 
     /**
@@ -161,7 +161,7 @@ public class TbBuildingVo implements Serializable {
      * 排序字段
      */
     @ExcelProperty(value = "排序字段")
-    private Long order;
+    private Long sort;
 
     /**
      * 组织编码
@@ -169,5 +169,23 @@ public class TbBuildingVo implements Serializable {
     @ExcelProperty(value = "组织编码")
     private String orgCode;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    @ExcelProperty(value = "数据状态：1有效，0无效")
+    private Long dataState;
+
+    /**
+     * 修改时间
+     */
+    @ExcelProperty(value = "修改时间")
+    private Date modifyTime;
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialServeVo.java

@@ -1,9 +1,7 @@
 package org.dromara.property.domain.vo;
 
-import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.property.domain.TbCeremonialServe;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -32,6 +30,12 @@ public class TbCeremonialServeVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
     /**
      * 分类id
      */
@@ -88,17 +92,19 @@ public class TbCeremonialServeVo implements Serializable {
     @ExcelProperty(value = "服务总价格")
     private Long servePrice;
 
+    /**
+     * 数据状态（模拟删除 0:删除 1:未删除）
+     */
+    @ExcelProperty(value = "数据状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "模=拟删除,0=:删除,1=:未删除")
+    private Long dataStauts;
+
     /**
      * 产品图片
      */
     @ExcelProperty(value = "产品图片")
     private String serveImage;
 
-    /**
-     * 产品图片Url
-     */
-    @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "serveImage")
-    private String serveImageUrl;
     /**
      * 排序
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCityAreaVo.java

@@ -29,6 +29,12 @@ public class TbCityAreaVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
     /**
      * 城市编码
      */
@@ -72,5 +78,11 @@ public class TbCityAreaVo implements Serializable {
     @ExcelProperty(value = "维度")
     private String lat;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    @ExcelProperty(value = "数据状态：1有效，0无效")
+    private Long dataState;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java

@@ -32,6 +32,12 @@ public class TbCommunityVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
     /**
      * 社区名称
      */
@@ -104,5 +110,17 @@ public class TbCommunityVo implements Serializable {
     @ExcelProperty(value = "组织编码")
     private String orgCode;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    @ExcelProperty(value = "数据状态：1有效，0无效")
+    private Long dataState;
+
+    /**
+     * 修改时间
+     */
+    @ExcelProperty(value = "修改时间")
+    private Date modifyTime;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbE8ConfigVo.java

@@ -30,6 +30,12 @@ public class TbE8ConfigVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
     /**
      * E8 名称
      */
@@ -54,5 +60,11 @@ public class TbE8ConfigVo implements Serializable {
     @ExcelProperty(value = "组织编码")
     private String orgCode;
 
+    /**
+     * 数据状态：1有效，0无效
+     */
+    @ExcelProperty(value = "数据状态：1有效，0无效")
+    private Long dataState;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java

@@ -1,7 +1,5 @@
 package org.dromara.property.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.property.domain.TbFloor;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -30,12 +28,6 @@ public class TbFloorVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
     /**
      * 社区编码
      */
@@ -66,29 +58,5 @@ public class TbFloorVo implements Serializable {
     @ExcelProperty(value = "组织编码")
     private String orgCode;
 
-    /**
-     * 数据状态：1有效，0无效
-     */
-    @ExcelProperty(value = "数据状态：1有效，0无效")
-    private Long dataState;
-
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private Long createEmpId;
-
-    /**
-     * 修改时间
-     */
-    @ExcelProperty(value = "修改时间")
-    private Date modifyTime;
-
-    /**
-     * 搜索值
-     */
-    @ExcelProperty(value = "搜索值")
-    private String searchValue;
-
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomBookingVo.java

@@ -126,7 +126,7 @@ public class TbRoomBookingVo implements Serializable {
      * 是否需要增值服务（0：需要，1：不需要）
      */
     @ExcelProperty(value = "是否需要增值服务", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_yes_no")
+    @ExcelDictFormat(dictType = "wy_sf")
     private Long addServices;
 
 

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java

@@ -30,6 +30,12 @@ public class TbVisitorManagementVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
     /**
      * 访客姓名
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdDeviceTypeVo.java

@@ -1,7 +1,5 @@
 package org.dromara.property.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.property.domain.TdDeviceType;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -30,6 +28,12 @@ public class TdDeviceTypeVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
     /**
      * 设备类型编码
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java

@@ -1,7 +1,5 @@
 package org.dromara.property.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.property.domain.TdFactory;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -30,6 +28,12 @@ public class TdFactoryVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
     /**
      * 厂商编码
      */
@@ -54,5 +58,11 @@ public class TdFactoryVo implements Serializable {
     @ExcelProperty(value = "数据状态：1有效，0无效")
     private Long dataState;
 
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java

@@ -86,6 +86,19 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
         lqw.eq(bo.getCqxz() != null, TbBuilding::getCqxz, bo.getCqxz());
         lqw.eq(StringUtils.isNotBlank(bo.getBdcbh()), TbBuilding::getBdcbh, bo.getBdcbh());
         lqw.eq(StringUtils.isNotBlank(bo.getCqbh()), TbBuilding::getCqbh, bo.getCqbh());
+        lqw.eq(StringUtils.isNotBlank(bo.getTdbh()), TbBuilding::getTdbh, bo.getTdbh());
+        lqw.eq(bo.getJzmj() != null, TbBuilding::getJzmj, bo.getJzmj());
+        lqw.eq(bo.getCqmj() != null, TbBuilding::getCqmj, bo.getCqmj());
+        lqw.eq(bo.getKzmj() != null, TbBuilding::getKzmj, bo.getKzmj());
+        lqw.eq(bo.getZymj() != null, TbBuilding::getZymj, bo.getZymj());
+        lqw.eq(bo.getPtmj() != null, TbBuilding::getPtmj, bo.getPtmj());
+        lqw.eq(bo.getCwmj() != null, TbBuilding::getCwmj, bo.getCwmj());
+        lqw.eq(bo.getBzcg() != null, TbBuilding::getBzcg, bo.getBzcg());
+        lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbBuilding::getOrgCode, bo.getOrgCode());
+        lqw.eq(bo.getDataState() != null, TbBuilding::getDataState, bo.getDataState());
+        lqw.eq(bo.getModifyTime() != null, TbBuilding::getModifyTime, bo.getModifyTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbBuilding::getSearchValue, bo.getSearchValue());
         return lqw;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java

@@ -83,6 +83,7 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
         lqw.eq(bo.getBeginTime() != null, TbCeremonialServe::getBeginTime, bo.getBeginTime());
         lqw.eq(bo.getEndTime() != null, TbCeremonialServe::getEndTime, bo.getEndTime());
         lqw.eq(bo.getServePrice() != null, TbCeremonialServe::getServePrice, bo.getServePrice());
+        lqw.eq(bo.getDataStauts() != null, TbCeremonialServe::getDataStauts, bo.getDataStauts());
         lqw.eq(StringUtils.isNotBlank(bo.getServeImage()), TbCeremonialServe::getServeImage, bo.getServeImage());
         lqw.eq(bo.getSort() != null, TbCeremonialServe::getSort, bo.getSort());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCityAreaServiceImpl.java

@@ -88,6 +88,7 @@ public class TbCityAreaServiceImpl implements ITbCityAreaService {
         lqw.like(StringUtils.isNotBlank(bo.getParentAreaName()), TbCityArea::getParentAreaName, bo.getParentAreaName());
         lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCityArea::getLon, bo.getLon());
         lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCityArea::getLat, bo.getLat());
+        lqw.eq(bo.getDataState() != null, TbCityArea::getDataState, bo.getDataState());
         return lqw;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java

@@ -86,6 +86,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
         lqw.eq(StringUtils.isNotBlank(bo.getImg()), TbCommunity::getImg, bo.getImg());
         lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbCommunity::getOrgCode, bo.getOrgCode());
         lqw.eq(bo.getDataState() != null, TbCommunity::getDataState, bo.getDataState());
+        lqw.eq(bo.getModifyTime() != null, TbCommunity::getModifyTime, bo.getModifyTime());
         return lqw;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java

@@ -80,9 +80,6 @@ public class TbFloorServiceImpl implements ITbFloorService {
         lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName());
         lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbFloor::getOrgCode, bo.getOrgCode());
         lqw.eq(bo.getDataState() != null, TbFloor::getDataState, bo.getDataState());
-        lqw.eq(bo.getCreateEmpId() != null, TbFloor::getCreateEmpId, bo.getCreateEmpId());
-        lqw.eq(bo.getModifyTime() != null, TbFloor::getModifyTime, bo.getModifyTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbFloor::getSearchValue, bo.getSearchValue());
         return lqw;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java

@@ -77,6 +77,7 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
         lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdFactory::getFactoryNo, bo.getFactoryNo());
         lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TdFactory::getFactoryName, bo.getFactoryName());
         lqw.eq(bo.getDataState() != null, TdFactory::getDataState, bo.getDataState());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TdFactory::getSearchValue, bo.getSearchValue());
         return lqw;
     }