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 fb9539f..40c51ff 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 @@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 楼栋信息对象 szxc_ld_info - * + * * @author hs - * @date 2024-03-16 + * @date 2024-03-28 */ public class SzxcLdInfo extends BaseEntity { @@ -18,10 +18,14 @@ public class SzxcLdInfo extends BaseEntity /** id */ private Long id; - /** 所属小区 */ - @Excel(name = "所属小区") + /** 所属小区id */ + @Excel(name = "所属小区id") private Long xqId; + /** 小区名称 */ + @Excel(name = "小区名称") + private String xqName; + /** 楼栋名称 */ @Excel(name = "楼栋名称") private String ldName; @@ -70,129 +74,138 @@ public class SzxcLdInfo 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 setXqId(Long xqId) + public void setXqId(Long xqId) { this.xqId = xqId; } - public Long getXqId() + public Long getXqId() { return xqId; } - public void setLdName(String ldName) + public void setXqName(String xqName) + { + this.xqName = xqName; + } + + public String getXqName() + { + return xqName; + } + public void setLdName(String ldName) { this.ldName = ldName; } - public String getLdName() + public String getLdName() { return ldName; } - public void setXqType(String xqType) + public void setXqType(String xqType) { this.xqType = xqType; } - public String getXqType() + public String getXqType() { return xqType; } - public void setLdSort(String ldSort) + public void setLdSort(String ldSort) { this.ldSort = ldSort; } - public String getLdSort() + public String getLdSort() { return ldSort; } - public void setLdjg(String ldjg) + public void setLdjg(String ldjg) { this.ldjg = ldjg; } - public String getLdjg() + public String getLdjg() { return ldjg; } - public void setQnfs(String qnfs) + public void setQnfs(String qnfs) { this.qnfs = qnfs; } - public String getQnfs() + public String getQnfs() { return qnfs; } - public void setLcNum(Long lcNum) + public void setLcNum(Long lcNum) { this.lcNum = lcNum; } - public Long getLcNum() + public Long getLcNum() { return lcNum; } - public void setUnitNum(Long unitNum) + public void setUnitNum(Long unitNum) { this.unitNum = unitNum; } - public Long getUnitNum() + public Long getUnitNum() { return unitNum; } - public void setHuNum(Long huNum) + public void setHuNum(Long huNum) { this.huNum = huNum; } - public Long getHuNum() + public Long getHuNum() { return huNum; } - public void setLdDescribe(String ldDescribe) + public void setLdDescribe(String ldDescribe) { this.ldDescribe = ldDescribe; } - public String getLdDescribe() + public String getLdDescribe() { return ldDescribe; } - 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; } @@ -200,24 +213,25 @@ public class SzxcLdInfo extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("xqId", getXqId()) - .append("ldName", getLdName()) - .append("xqType", getXqType()) - .append("ldSort", getLdSort()) - .append("ldjg", getLdjg()) - .append("qnfs", getQnfs()) - .append("lcNum", getLcNum()) - .append("unitNum", getUnitNum()) - .append("huNum", getHuNum()) - .append("ldDescribe", getLdDescribe()) - .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("xqId", getXqId()) + .append("xqName", getXqName()) + .append("ldName", getLdName()) + .append("xqType", getXqType()) + .append("ldSort", getLdSort()) + .append("ldjg", getLdjg()) + .append("qnfs", getQnfs()) + .append("lcNum", getLcNum()) + .append("unitNum", getUnitNum()) + .append("huNum", getHuNum()) + .append("ldDescribe", getLdDescribe()) + .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 95c4847..4b39631 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml @@ -1,12 +1,13 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -26,13 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, xq_id, 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, 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 - + - + insert into szxc_ld_info xq_id, + xq_name, ld_name, xq_type, ld_sort, @@ -73,9 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{xqId}, + #{xqName}, #{ldName}, #{xqType}, #{ldSort}, @@ -92,13 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + update szxc_ld_info xq_id = #{xqId}, + xq_name = #{xqName}, ld_name = #{ldName}, xq_type = #{xqType}, ld_sort = #{ldSort}, @@ -124,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_ld_info where id in + delete from szxc_ld_info where id in #{id} diff --git a/ruoyi-ui/src/views/szxc/ldinfo/index.vue b/ruoyi-ui/src/views/szxc/ldinfo/index.vue index b230a10..9d1026d 100644 --- a/ruoyi-ui/src/views/szxc/ldinfo/index.vue +++ b/ruoyi-ui/src/views/szxc/ldinfo/index.vue @@ -1,10 +1,18 @@ - + - - + + + + + @@ -242,171 +254,173 @@