From 0726b31669d0905bd84f863dfa56a42b15d153de Mon Sep 17 00:00:00 2001 From: YIN Date: Thu, 26 Dec 2024 09:16:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cpxt/biz/domain/BizOrder.java | 4 ++++ .../main/java/com/cpxt/biz/domain/BizOrderSub.java | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java index dcefc1f..57e08f9 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java @@ -259,6 +259,10 @@ public class BizOrder @Excel(name = "到达纬度") private BigDecimal arriveLat; + /** 状态 */ + @Excel(name = "运单状态") + private Integer subStatus; + /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间") diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java index fa598a1..1b40fe3 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java @@ -50,4 +50,15 @@ public class BizOrderSub @Excel(name = "高", readConverterExp = "米=") private BigDecimal height; + /** 物品类型 */ + @Excel(name = "物品类型") + private String goodsType; + + /** 物品名称 */ + @Excel(name = "物品名称") + private String goodsName; + + /** 订单费用 */ + @Excel(name = "订单费用") + private BigDecimal orderFee; } From 9e42f24bff538d6c3e7e869270f413b1ea73d2a3 Mon Sep 17 00:00:00 2001 From: YIN Date: Thu, 26 Dec 2024 19:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cpxt/web/task/GetLocationTask.java | 8 ++++---- .../java/com/cpxt/biz/domain/BizCarState.java | 4 ++-- .../java/com/cpxt/biz/domain/BizDriverClock.java | 4 ++-- .../main/java/com/cpxt/biz/domain/BizOrder.java | 16 ++++++++-------- .../main/java/com/cpxt/biz/domain/TrackTemp.java | 4 ++-- .../java/com/cpxt/biz/domain/vo/BizOrderVo.java | 8 ++++---- .../cpxt/biz/domain/vo/BizOrderVoCustomer.java | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java b/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java index 0604a42..05595c4 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java @@ -79,8 +79,8 @@ public class GetLocationTask { newstate.setGpsTime(DateUtils.parseDate(Helper.NStr(info.getGpsTime()).replace(".0",""))); newstate.setSpeed(Helper.FLong(info.getSpeed())); newstate.setOdometer(new BigDecimal(Helper.FDouble(info.getOdometer())) ); - newstate.setLat(info.getLat()); - newstate.setLon(info.getLon()); + newstate.setLat(info.getLat02()); + newstate.setLon(info.getLon02()); newstate.setDirection(Helper.FInt(info.getDirection())); newstate.setStatus(info.getStatus()); newstate.setPlaceName(info.getPlaceName()); @@ -96,8 +96,8 @@ public class GetLocationTask { newstate.setT6(info.getT6()); newstate.setT7(info.getT7()); newstate.setT8(info.getT8()); - newstate.setLat02(info.getLat02()); - newstate.setLon02(info.getLon02()); + newstate.setLat02(info.getLat()); + newstate.setLon02(info.getLon()); newstate.setAreaName(info.getAreaName()); newstate.setTime1(info.getTime1()); newstate.setTime2(info.getTime2()); diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarState.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarState.java index 2c0ecc0..1d7c249 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarState.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarState.java @@ -44,8 +44,8 @@ public class BizCarState private String regName; /** 定位时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date gpsTime; /** 速度 */ diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriverClock.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriverClock.java index c9020d3..8d4d10f 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriverClock.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriverClock.java @@ -31,8 +31,8 @@ public class BizDriverClock private Integer clockType; /** 打卡时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "打卡时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date clockTime; /** 打卡车辆 */ diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java index 57e08f9..a285b4f 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java @@ -208,8 +208,8 @@ public class BizOrder private String cancelReason; /** 取消时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date cancelTime; /** 支付类型 寄付，到付，月结 */ @@ -229,8 +229,8 @@ public class BizOrder private Integer payStatus; /** 支付时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date payTime; /** 状态 */ @@ -238,13 +238,13 @@ public class BizOrder private Integer status; /** 开始配送时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始配送时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始配送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date arriveTime; /** 到达备注 */ diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/TrackTemp.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/TrackTemp.java index 44202c0..897ad55 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/TrackTemp.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/TrackTemp.java @@ -42,8 +42,8 @@ public class TrackTemp extends BaseEntity private String regName; /** 定位时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date gpsTime; /** 速度 */ diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVo.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVo.java index 6840e92..2efd902 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVo.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVo.java @@ -170,7 +170,7 @@ public class BizOrderVo private String cancelReason; /** 取消时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date cancelTime; /** 支付类型 寄付，到付，月结 */ @@ -186,18 +186,18 @@ public class BizOrderVo private Integer payStatus; /** 支付时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; /** 状态 */ private Integer status; /** 开始配送时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date arriveTime; /** 到达备注 */ diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVoCustomer.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVoCustomer.java index 9f33dcd..0bc9359 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVoCustomer.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVoCustomer.java @@ -166,7 +166,7 @@ public class BizOrderVoCustomer private String cancelReason; /** 取消时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date cancelTime; /** 支付类型 寄付，到付，月结 */ @@ -182,18 +182,18 @@ public class BizOrderVoCustomer private Integer payStatus; /** 支付时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; /** 状态 */ private Integer status; /** 开始配送时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date arriveTime; /** 到达备注 */