yfd
/
cpxt-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java
#	cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java
master
luojian 2024-12-26 19:54:30 +08:00
parent a86d5d61ac 9e42f24bff
commit 10ef3e096b
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java
View File

@ -79,8 +79,8 @@ public class GetLocationTask {
newstate.setGpsTime(DateUtils.parseDate(Helper.NStr(info.getGpsTime()).replace(".0",""))); newstate.setGpsTime(DateUtils.parseDate(Helper.NStr(info.getGpsTime()).replace(".0","")));
newstate.setSpeed(Helper.FLong(info.getSpeed())); newstate.setSpeed(Helper.FLong(info.getSpeed()));
newstate.setOdometer(new BigDecimal(Helper.FDouble(info.getOdometer())) ); newstate.setOdometer(new BigDecimal(Helper.FDouble(info.getOdometer())) );
newstate.setLat(info.getLat()); newstate.setLat(info.getLat02());
newstate.setLon(info.getLon()); newstate.setLon(info.getLon02());
newstate.setDirection(Helper.FInt(info.getDirection())); newstate.setDirection(Helper.FInt(info.getDirection()));
newstate.setStatus(info.getStatus()); newstate.setStatus(info.getStatus());
newstate.setPlaceName(info.getPlaceName()); newstate.setPlaceName(info.getPlaceName());
@ -96,8 +96,8 @@ public class GetLocationTask {
newstate.setT6(info.getT6()); newstate.setT6(info.getT6());
newstate.setT7(info.getT7()); newstate.setT7(info.getT7());
newstate.setT8(info.getT8()); newstate.setT8(info.getT8());
newstate.setLat02(info.getLat02()); newstate.setLat02(info.getLat());
newstate.setLon02(info.getLon02()); newstate.setLon02(info.getLon());
newstate.setAreaName(info.getAreaName()); newstate.setAreaName(info.getAreaName());
newstate.setTime1(info.getTime1()); newstate.setTime1(info.getTime1());
newstate.setTime2(info.getTime2()); newstate.setTime2(info.getTime2());

4
cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarState.java
View File

@ -44,8 +44,8 @@ public class BizCarState
private String regName; private String regName;
/** 定位时间 */ /** 定位时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date gpsTime; private Date gpsTime;
/** 速度 */ /** 速度 */

4
cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriverClock.java
View File

@ -36,8 +36,8 @@ public class BizDriverClock
private Integer clockType; private Integer clockType;
/** 打卡时间 */ /** 打卡时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "打卡时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date clockTime; private Date clockTime;
/** 打卡车辆 */ /** 打卡车辆 */

4
cpxt-system/src/main/java/com/cpxt/biz/domain/TrackTemp.java
View File

@ -42,8 +42,8 @@ public class TrackTemp extends BaseEntity
private String regName; private String regName;
/** 定位时间 */ /** 定位时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "定位时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date gpsTime; private Date gpsTime;
/** 速度 */ /** 速度 */

8
cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVo.java
View File

@ -170,7 +170,7 @@ public class BizOrderVo
private String cancelReason; private String cancelReason;
/** 取消时间 */ /** 取消时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime; private Date cancelTime;
/** 支付类型 寄付，到付，月结 */ /** 支付类型 寄付，到付，月结 */
@ -186,18 +186,18 @@ public class BizOrderVo
private Integer payStatus; private Integer payStatus;
/** 支付时间 */ /** 支付时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime; private Date payTime;
/** 状态 */ /** 状态 */
private Integer status; private Integer status;
/** 开始配送时间 */ /** 开始配送时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime; private Date startTime;
/** 到达时间 */ /** 到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime; private Date arriveTime;
/** 到达备注 */ /** 到达备注 */

8
cpxt-system/src/main/java/com/cpxt/biz/domain/vo/BizOrderVoCustomer.java
View File

@ -166,7 +166,7 @@ public class BizOrderVoCustomer
private String cancelReason; private String cancelReason;
/** 取消时间 */ /** 取消时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime; private Date cancelTime;
/** 支付类型 寄付，到付，月结 */ /** 支付类型 寄付，到付，月结 */
@ -182,18 +182,18 @@ public class BizOrderVoCustomer
private Integer payStatus; private Integer payStatus;
/** 支付时间 */ /** 支付时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime; private Date payTime;
/** 状态 */ /** 状态 */
private Integer status; private Integer status;
/** 开始配送时间 */ /** 开始配送时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime; private Date startTime;
/** 到达时间 */ /** 到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime; private Date arriveTime;
/** 到达备注 */ /** 到达备注 */