From 93837e6863f4631da65c194ed3e0e97b3a01ca4f Mon Sep 17 00:00:00 2001 From: hansha Date: Thu, 28 Mar 2024 11:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/szxc/domain/SzxcLdInfo.java | 20 +-- .../com/ruoyi/szxc/domain/SzxcXqInfo.java | 119 ++++++++++-------- .../mapper/szxc/SzxcLdInfoMapper.xml | 12 +- .../mapper/szxc/SzxcXqInfoMapper.xml | 25 ++-- 4 files changed, 98 insertions(+), 78 deletions(-) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLdInfo.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLdInfo.java index 40c51ff..811a714 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLdInfo.java +++ b/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其它) */ - @Excel(name = "类型(0小区楼栋1独立房2其它)") - private String xqType; + /** 楼栋类型(0小区楼栋1独立房2其它) */ + @Excel(name = "楼栋类型(0小区楼栋1独立房2其它)") + 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()) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXqInfo.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXqInfo.java index 7741356..ce86f78 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXqInfo.java +++ b/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; @@ -73,129 +78,138 @@ public class SzxcXqInfo extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setXqType(String xqType) + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setXqType(String xqType) { this.xqType = xqType; } - public String getXqType() + public String getXqType() { return xqType; } - public void setLdNum(Long ldNum) + public void setLdNum(Long ldNum) { this.ldNum = ldNum; } - public Long getLdNum() + public Long getLdNum() { return ldNum; } - public void setJzArea(String jzArea) + public void setJzArea(String jzArea) { this.jzArea = jzArea; } - public String getJzArea() + public String getJzArea() { return jzArea; } - public void setZdArea(String zdArea) + public void setZdArea(String zdArea) { this.zdArea = zdArea; } - public String getZdArea() + public String getZdArea() { return zdArea; } - public void setWyType(String wyType) + public void setWyType(String wyType) { this.wyType = wyType; } - public String getWyType() + public String getWyType() { return wyType; } - public void setWyResponse(String wyResponse) + public void setWyResponse(String wyResponse) { this.wyResponse = wyResponse; } - public String getWyResponse() + public String getWyResponse() { return wyResponse; } - public void setWyPhone(String wyPhone) + public void setWyPhone(String wyPhone) { this.wyPhone = wyPhone; } - public String getWyPhone() + public String getWyPhone() { return wyPhone; } - public void setXqAddress(String xqAddress) + public void setXqAddress(String xqAddress) { this.xqAddress = xqAddress; } - public String getXqAddress() + public String getXqAddress() { return xqAddress; } - public void setBuildDate(Date buildDate) + public void setBuildDate(Date buildDate) { this.buildDate = buildDate; } - public Date getBuildDate() + public Date getBuildDate() { return buildDate; } - public void setXqDescribe(String xqDescribe) + public void setXqDescribe(String xqDescribe) { this.xqDescribe = xqDescribe; } - public String getXqDescribe() + public String getXqDescribe() { return xqDescribe; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -203,24 +217,25 @@ public class SzxcXqInfo extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("xqType", getXqType()) - .append("ldNum", getLdNum()) - .append("jzArea", getJzArea()) - .append("zdArea", getZdArea()) - .append("wyType", getWyType()) - .append("wyResponse", getWyResponse()) - .append("wyPhone", getWyPhone()) - .append("xqAddress", getXqAddress()) - .append("buildDate", getBuildDate()) - .append("xqDescribe", getXqDescribe()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("name", getName()) + .append("xqType", getXqType()) + .append("ldNum", getLdNum()) + .append("jzArea", getJzArea()) + .append("zdArea", getZdArea()) + .append("wyType", getWyType()) + .append("wyResponse", getWyResponse()) + .append("wyPhone", getWyPhone()) + .append("xqAddress", getXqAddress()) + .append("buildDate", getBuildDate()) + .append("xqDescribe", getXqDescribe()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml index 4b39631..f2b0717 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml @@ -9,7 +9,7 @@ - + @@ -27,7 +27,7 @@ - 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 - + + and name like concat('%', #{name}, '%') and xq_type = #{xqType} and ld_num = #{ldNum} and jz_area = #{jzArea} @@ -47,15 +49,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_id = #{userId} - + - + insert into szxc_xq_info + name, xq_type, ld_num, jz_area, @@ -73,8 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + + #{name}, #{xqType}, #{ldNum}, #{jzArea}, @@ -92,12 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + update szxc_xq_info + name = #{name}, xq_type = #{xqType}, ld_num = #{ldNum}, jz_area = #{jzArea}, @@ -124,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_xq_info where id in + delete from szxc_xq_info where id in #{id}