Browse Source

提交修复

master
主管理员 4 months ago
parent
commit
c980910ec3
3 changed files with 161 additions and 140 deletions
  1. +22
    -17
      CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue
  2. +111
    -96
      ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java
  3. +28
    -27
      ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml

+ 22
- 17
CatmDogd-Mall-Front-test/src/views/model/AppletAddress/index.vue View File

@ -111,11 +111,11 @@
<el-table-column label="详细地址" align="center" prop="address" v-if="columns[1].visible"/>
<el-table-column label="接单状态" align="center" prop="status" v-if="columns[2].visible"/>
<el-table-column label="接单范围" align="center" prop="range" v-if="columns[3].visible"/>
<el-table-column label="${comment}" align="center" prop="outDate" width="180" v-if="columns[4].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.outDate, '')}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="OUT_DATE" align="center" prop="outDate" width="180" v-if="columns[4].visible">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.outDate, '')}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="关联用户id" align="center" prop="userId" v-if="columns[5].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -124,19 +124,19 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['model:AppletAddress:edit']"
v-hasPermi="['model:appletAddress:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['model:AppletAddress:remove']"
v-hasPermi="['model:appletAddress:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -145,7 +145,7 @@
@pagination="getList"
/>
<!-- 添加或修改地址信息对话框 -->
<!-- 添加或修改地址信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
<el-form-item label="接单地址" prop="area">
@ -154,17 +154,22 @@
<el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" />
</el-form-item>
<el-form-item label="接单状态">
<el-radio-group v-model="form.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="接单范围" prop="range">
<el-input v-model="form.range" placeholder="请输入接单范围" />
</el-form-item>
<el-form-item label="${comment}" prop="outDate">
<el-date-picker clearable size="small"
v-model="form.outDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择${comment}">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="OUT_DATE" prop="outDate">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="form.outDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- placeholder="选择OUT_DATE">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="关联用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入关联用户id" />
</el-form-item>


+ 111
- 96
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java View File

@ -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();
// }
}

+ 28
- 27
ruoyi-catdog/src/main/resources/mapper/model/AppletAddressMapper.xml View File

@ -3,38 +3,37 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.model.mapper.AppletAddressMapper">
<resultMap type="AppletAddress" id="AppletAddressResult">
<result property="id" column="id" />
<result property="area" column="area" />
<result property="address" column="address" />
<result property="status" column="status" />
<result property="range" column="range" />
<result property="outDate" column="out_date" />
<result property="userId" column="user_id" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="id" column="id"/>
<result property="area" column="area"/>
<result property="address" column="address"/>
<result property="status" column="status"/>
<result property="rangeNo" column="range_no"/>
<result property="userId" column="user_id"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
</resultMap>
<sql id="selectAppletAddressVo">
select id, area, address, status, range, out_date, user_id, del_flag, create_by, create_time, update_by, update_time from applet_address
</sql>
select id, area, address, status, range_no, user_id, del_flag, create_by, create_time, update_by, update_time from applet_address </sql>
<select id="selectAppletAddressList" parameterType="AppletAddress" resultMap="AppletAddressResult">
<include refid="selectAppletAddressVo"/>
<where>
<where>
<if test="area != null and area != ''"> and area = #{area}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="range != null and range != ''"> and range = #{range}</if>
<if test="outDate != null "> and out_date = #{outDate}</if>
<if test="rangeNo != null and rangeNo != ''"> and range_no = #{rangeNo}</if>
<if test="userId != null "> and user_id = #{userId}</if>
</where>
</select>
<select id="selectAppletAddressById" parameterType="Long" resultMap="AppletAddressResult">
<include refid="selectAppletAddressVo"/>
where id = #{id}
@ -43,31 +42,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertAppletAddress" parameterType="AppletAddress" useGeneratedKeys="true" keyProperty="id">
insert into applet_address
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="area != null">area,</if>
<if test="address != null">address,</if>
<if test="status != null">status,</if>
<if test="range != null">range,</if>
<if test="outDate != null">out_date,</if>
<if test="rangeNo != null">range_no,</if>
<if test="userId != null">user_id,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="area != null">#{area},</if>
<if test="address != null">#{address},</if>
<if test="status != null">#{status},</if>
<if test="range != null">#{range},</if>
<if test="outDate != null">#{outDate},</if>
<if test="rangeNo != null">#{rangeNo},</if>
<if test="userId != null">#{userId},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</trim>
</insert>
<update id="updateAppletAddress" parameterType="AppletAddress">
@ -76,14 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="area != null">area = #{area},</if>
<if test="address != null">address = #{address},</if>
<if test="status != null">status = #{status},</if>
<if test="range != null">range = #{range},</if>
<if test="outDate != null">out_date = #{outDate},</if>
<if test="rangeNo != null">range_no = #{rangeNo},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>


Loading…
Cancel
Save