楼栋字段修改

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLdInfo.java

@@ -30,12 +30,12 @@ public class SzxcLdInfo extends BaseEntity
     @Excel(name = "楼栋名称")
     private String ldName;
 
-    /** 类型(0小区楼栋1独立房2其它) */
+    /** 楼栋类型(0小区楼栋1独立房2其它) */
-    @Excel(name = "类型(0小区楼栋1独立房2其它)")
+    @Excel(name = "楼栋类型(0小区楼栋1独立房2其它)")
-    private String xqType;
+    private String ldType;
 
-    /** 类别字典 */
+    /** 楼栋类别字典 */
-    @Excel(name = "类别字典")
+    @Excel(name = "楼栋类别字典")
     private String ldSort;
 
     /** 楼栋结构字典 */
@@ -110,14 +110,14 @@ public class SzxcLdInfo extends BaseEntity
     {
         return ldName;
     }
-    public void setXqType(String xqType)
+    public void setLdType(String ldType)
     {
-        this.xqType = xqType;
+        this.ldType = ldType;
     }
 
-    public String getXqType()
+    public String getLdType()
     {
-        return xqType;
+        return ldType;
     }
     public void setLdSort(String ldSort)
     {
@@ -217,7 +217,7 @@ public class SzxcLdInfo extends BaseEntity
                 .append("xqId", getXqId())
                 .append("xqName", getXqName())
                 .append("ldName", getLdName())
-                .append("xqType", getXqType())
+                .append("ldType", getLdType())
                 .append("ldSort", getLdSort())
                 .append("ldjg", getLdjg())
                 .append("qnfs", getQnfs())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXqInfo.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 小区信息对象 szxc_xq_info
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-28
  */
 public class SzxcXqInfo extends BaseEntity
 {
@@ -20,6 +21,10 @@ public class SzxcXqInfo extends BaseEntity
     /** id */
     private Long id;
 
+    /** 小区名称 */
+    @Excel(name = "小区名称")
+    private String name;
+
     /** 类型(0老旧1新2片区散户) */
     @Excel(name = "类型(0老旧1新2片区散户)")
     private String xqType;
@@ -82,6 +87,15 @@ public class SzxcXqInfo extends BaseEntity
     {
         return id;
     }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
     public void setXqType(String xqType)
     {
         this.xqType = xqType;
@@ -204,6 +218,7 @@ public class SzxcXqInfo extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("name", getName())
                 .append("xqType", getXqType())
                 .append("ldNum", getLdNum())
                 .append("jzArea", getJzArea())

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml

@@ -9,7 +9,7 @@
         <result property="xqId"    column="xq_id"    />
         <result property="xqName"    column="xq_name"    />
         <result property="ldName"    column="ld_name"    />
-        <result property="xqType"    column="xq_type"    />
+        <result property="ldType"    column="ld_type"    />
         <result property="ldSort"    column="ld_sort"    />
         <result property="ldjg"    column="ldjg"    />
         <result property="qnfs"    column="qnfs"    />
@@ -27,7 +27,7 @@
     </resultMap>
 
     <sql id="selectSzxcLdInfoVo">
-        select id, xq_id, xq_name, ld_name, xq_type, ld_sort, ldjg, qnfs, lc_num, unit_num, hu_num, ld_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_ld_info
+        select id, xq_id, xq_name, ld_name, ld_type, ld_sort, ldjg, qnfs, lc_num, unit_num, hu_num, ld_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_ld_info
     </sql>
 
     <select id="selectSzxcLdInfoList" parameterType="SzxcLdInfo" resultMap="SzxcLdInfoResult">
@@ -36,7 +36,7 @@
             <if test="xqId != null "> and xq_id = #{xqId}</if>
             <if test="xqName != null  and xqName != ''"> and xq_name like concat('%', #{xqName}, '%')</if>
             <if test="ldName != null  and ldName != ''"> and ld_name like concat('%', #{ldName}, '%')</if>
-            <if test="xqType != null  and xqType != ''"> and xq_type = #{xqType}</if>
+            <if test="ldType != null  and ldType != ''"> and ld_type = #{ldType}</if>
             <if test="ldSort != null  and ldSort != ''"> and ld_sort = #{ldSort}</if>
             <if test="ldjg != null  and ldjg != ''"> and ldjg = #{ldjg}</if>
             <if test="qnfs != null  and qnfs != ''"> and qnfs = #{qnfs}</if>
@@ -61,7 +61,7 @@
             <if test="xqId != null">xq_id,</if>
             <if test="xqName != null">xq_name,</if>
             <if test="ldName != null">ld_name,</if>
-            <if test="xqType != null">xq_type,</if>
+            <if test="ldType != null">ld_type,</if>
             <if test="ldSort != null">ld_sort,</if>
             <if test="ldjg != null">ldjg,</if>
             <if test="qnfs != null">qnfs,</if>
@@ -81,7 +81,7 @@
             <if test="xqId != null">#{xqId},</if>
             <if test="xqName != null">#{xqName},</if>
             <if test="ldName != null">#{ldName},</if>
-            <if test="xqType != null">#{xqType},</if>
+            <if test="ldType != null">#{ldType},</if>
             <if test="ldSort != null">#{ldSort},</if>
             <if test="ldjg != null">#{ldjg},</if>
             <if test="qnfs != null">#{qnfs},</if>
@@ -105,7 +105,7 @@
             <if test="xqId != null">xq_id = #{xqId},</if>
             <if test="xqName != null">xq_name = #{xqName},</if>
             <if test="ldName != null">ld_name = #{ldName},</if>
-            <if test="xqType != null">xq_type = #{xqType},</if>
+            <if test="ldType != null">ld_type = #{ldType},</if>
             <if test="ldSort != null">ld_sort = #{ldSort},</if>
             <if test="ldjg != null">ldjg = #{ldjg},</if>
             <if test="qnfs != null">qnfs = #{qnfs},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="SzxcXqInfo" id="SzxcXqInfoResult">
         <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
         <result property="xqType"    column="xq_type"    />
         <result property="ldNum"    column="ld_num"    />
         <result property="jzArea"    column="jz_area"    />
@@ -26,12 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcXqInfoVo">
-        select id, xq_type, ld_num, jz_area, zd_area, wy_type, wy_response, wy_phone, xq_address, build_date, xq_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xq_info
+        select id, name, xq_type, ld_num, jz_area, zd_area, wy_type, wy_response, wy_phone, xq_address, build_date, xq_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xq_info
     </sql>
 
     <select id="selectSzxcXqInfoList" parameterType="SzxcXqInfo" resultMap="SzxcXqInfoResult">
         <include refid="selectSzxcXqInfoVo"/>
         <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="xqType != null  and xqType != ''"> and xq_type = #{xqType}</if>
             <if test="ldNum != null "> and ld_num = #{ldNum}</if>
             <if test="jzArea != null  and jzArea != ''"> and jz_area = #{jzArea}</if>
@@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertSzxcXqInfo" parameterType="SzxcXqInfo" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_xq_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
             <if test="xqType != null">xq_type,</if>
             <if test="ldNum != null">ld_num,</if>
             <if test="jzArea != null">jz_area,</if>
@@ -75,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
             <if test="xqType != null">#{xqType},</if>
             <if test="ldNum != null">#{ldNum},</if>
             <if test="jzArea != null">#{jzArea},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSzxcXqInfo" parameterType="SzxcXqInfo">
         update szxc_xq_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
             <if test="xqType != null">xq_type = #{xqType},</if>
             <if test="ldNum != null">ld_num = #{ldNum},</if>
             <if test="jzArea != null">jz_area = #{jzArea},</if>