From ee60824d273cceae9048275d4950b6075611ace9 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Sep 2024 13:44:16 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF=E5=8E=9F=E5=BD=95?=
=?UTF-8?q?=E5=85=A5=E6=97=B6=E9=97=B4=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D?=
=?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E8=B5=84=E6=96=99=E5=85=B6=E4=BB=96=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=9A=84?=
=?UTF-8?q?=E5=8E=9F=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=92=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=BD=95=E5=85=A5=E4=BA=BA=E3=80=81=E5=BD=95=E5=85=A5?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=BA=E3=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=9B?=
=?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=8E=BB=E6=8E=89=E5=8E=9F=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E3=80=81=E6=96=B0=E5=A2=9E=E8=BF=99=E5=9B=9B=E4=B8=AA?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=E6=8F=92=E5=85=A5=E5=92=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E8=BF=99=E5=9B=9B?=
=?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/domain/SysShippingAddress.java | 21 +++++--------------
.../impl/SysShippingAddressServiceImpl.java | 5 +++--
.../system/SysShippingAddressMapper.xml | 19 +++++++++++------
.../shippingaddress/shippingaddress.html | 10 ++++-----
4 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysShippingAddress.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysShippingAddress.java
index cb4871bb..fc5789f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysShippingAddress.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysShippingAddress.java
@@ -58,9 +58,8 @@ public class SysShippingAddress extends BaseEntity
@Excel(name = "传真")
private String customerFax;
- private String firstAddTime;
- private String updateInfoTime;
+
public void setDeliveryId(Long deliveryId)
{
this.deliveryId = deliveryId;
@@ -161,21 +160,9 @@ public class SysShippingAddress extends BaseEntity
return customerFax;
}
- public String getFirstAddTime() {
- return firstAddTime;
- }
- public void setFirstAddTime(String firstAddTime) {
- this.firstAddTime = firstAddTime;
- }
- public String getUpdateInfoTime() {
- return updateInfoTime;
- }
- public void setUpdateInfoTime(String updateInfoTime) {
- this.updateInfoTime = updateInfoTime;
- }
@Override
public String toString() {
@@ -191,8 +178,10 @@ public class SysShippingAddress extends BaseEntity
.append("plantArea", getPlantArea())
.append("postalCode", getPostalCode())
.append("customerFax", getCustomerFax())
- .append("firstAddTime", getFirstAddTime())
- .append("updateInfoTime", getUpdateInfoTime())
+ .append("createTime", getCreateTime())
+ .append("createBy", getCreateBy())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
.toString();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java
index 09112a2c..ad42ea62 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java
@@ -9,6 +9,7 @@ import com.ruoyi.system.service.ISysShippingAddressService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -58,7 +59,7 @@ public class SysShippingAddressServiceImpl implements ISysShippingAddressService
{
String loginName = ShiroUtils.getLoginName();
sysShippingAddress.setCreateBy(loginName);
- sysShippingAddress.setCreateTime(DateUtils.getNowDate());
+ sysShippingAddress.setCreateTime(new Date());
int id = sysShippingAddressMapper.insertSysShippingAddress(sysShippingAddress);
sysShippingAddress.getDeliveryId();
return id;
@@ -74,7 +75,7 @@ public class SysShippingAddressServiceImpl implements ISysShippingAddressService
public int updateSysShippingAddress(SysShippingAddress sysShippingAddress)
{
sysShippingAddress.setUpdateBy(ShiroUtils.getLoginName());
- sysShippingAddress.setUpdateTime(DateUtils.getNowDate());
+ sysShippingAddress.setUpdateTime(new Date());
return sysShippingAddressMapper.updateSysShippingAddress(sysShippingAddress);
}
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
index 75790a1e..fd04ecf5 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
@@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
+
+
+
- select delivery_id, enterprise_code, enterprise_name, customer_phone, customer_name, delivery_address, customer_name_two, detailed_description, plant_area, postal_code, customer_fax, first_add_time, update_info_time from sys_shipping_address
+ select delivery_id, enterprise_code, enterprise_name, customer_phone, customer_name, delivery_address, customer_name_two, detailed_description, plant_area, postal_code, customer_fax, create_by, create_time, update_by, update_time from sys_shipping_address