From c980910ec31b13e967f6faba97a8b5d38009aedd Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Sat, 29 Mar 2025 03:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/model/AppletAddress/index.vue | 39 ++-- .../java/com/ruoyi/model/domain/AppletAddress.java | 207 +++++++++++---------- .../resources/mapper/model/AppletAddressMapper.xml | 55 +++--- 3 files changed, 161 insertions(+), 140 deletions(-) diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue index 67c1e1c..31bc898 100644 --- a/CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue @@ -111,11 +111,11 @@ - - - + + + + + - + - + @@ -154,17 +154,22 @@ + + + 请选择字典生成 + + - - - - + + + + + + + + diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java index 8d51732..d1b6aba 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java @@ -1,7 +1,9 @@ package com.ruoyi.model.domain; +import java.time.LocalDateTime; import java.util.Date; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -9,10 +11,11 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 地址信息对象 applet_address - * + * * @author ruoyi * @date 2025-03-28 */ +@Data public class AppletAddress extends BaseEntity { private static final long serialVersionUID = 1L; @@ -34,107 +37,119 @@ public class AppletAddress extends BaseEntity /** 接单范围 */ @Excel(name = "接单范围") - private String range; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Date outDate; + private String rangeNo; /** 关联用户id */ @Excel(name = "关联用户id") private Long userId; + + /** 创建时间 */ + private LocalDateTime createTime; + + + + /** 审核时间 */ + private LocalDateTime updateTime; + + + /** 创建人 */ + @Excel(name = "创建人") + private Long createBy; + + /** 经度 */ + @Excel(name = "经度") + private String longitude; + + /** 修改人 */ + @Excel(name = "修改人") + private Long updateBy; + + /** 纬度 */ + @Excel(name = "纬度") + private String latitude; /** 删除标识 */ private Integer delFlag; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setArea(String area) - { - this.area = area; - } - - public String getArea() - { - return area; - } - public void setAddress(String address) - { - this.address = address; - } - - public String getAddress() - { - return address; - } - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - public void setRange(String range) - { - this.range = range; - } - - public String getRange() - { - return range; - } - public void setOutDate(Date outDate) - { - this.outDate = outDate; - } - - public Date getOutDate() - { - return outDate; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setDelFlag(Integer delFlag) - { - this.delFlag = delFlag; - } - - public Integer getDelFlag() - { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("area", getArea()) - .append("address", getAddress()) - .append("status", getStatus()) - .append("range", getRange()) - .append("outDate", getOutDate()) - .append("userId", getUserId()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } +// public void setId(Long id) +// { +// this.id = id; +// } +// +// public Long getId() +// { +// return id; +// } +// public void setArea(String area) +// { +// this.area = area; +// } +// +// public String getArea() +// { +// return area; +// } +// public void setAddress(String address) +// { +// this.address = address; +// } +// +// public String getAddress() +// { +// return address; +// } +// public void setStatus(String status) +// { +// this.status = status; +// } +// +// public String getStatus() +// { +// return status; +// } +// public void setRangeNo(String rangeNo) +// { +// this.rangeNo = rangeNo; +// } +// +// public String getRangeNo() +// { +// return rangeNo; +// } +// +// public void setUserId(Long userId) +// { +// this.userId = userId; +// } +// +// public Long getUserId() +// { +// return userId; +// } +// public void setDelFlag(Integer delFlag) +// { +// this.delFlag = delFlag; +// } +// +// public Integer getDelFlag() +// { +// return delFlag; +// } +// +// @Override +// public String toString() { +// return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +// .append("id", getId()) +// .append("area", getArea()) +// .append("address", getAddress()) +// .append("status", getStatus()) +// .append("rangeNo", getRangeNo()) +// .append("userId", getUserId()) +// .append("delFlag", getDelFlag()) +// .append("createBy", getCreateBy()) +// .append("createTime", getCreateTime()) +// .append("updateBy", getUpdateBy()) +// .append("updateTime", getUpdateTime()) +// .toString(); +// } } diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml index a1797a9..2a0e29c 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml @@ -3,38 +3,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - + + + + + + + + + + + + + - select id, area, address, status, range, out_date, user_id, del_flag, create_by, create_time, update_by, update_time from applet_address - + select id, area, address, status, range_no, user_id, del_flag, create_by, create_time, update_by, update_time from applet_address - +