weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期时区问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-28 21:21:51 +08:00
parent 39503f9f3c
commit c7cb8614ef
170 changed files with 690 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDTO.java
+3 -3
View File
@@ -131,7 +131,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
private Integer payStatus;
@ApiModelProperty("付款时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date payTime;
@@ -139,7 +139,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
private Integer waybillVerifyFlag;
@ApiModelProperty("标记核实时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date waybillVerifyTime;
@@ -208,7 +208,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
private BigDecimal commissionRate;
@ApiModelProperty("货主付款时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date payTimeShipper;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java
+5 -5
View File
@@ -46,7 +46,7 @@ public class DispatchFeignDto extends BaseVOEntity{
private Date dispatchDate;
/** 计划发车日期 */
@ApiModelProperty("计划发车日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计划发车日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date planDepartureDate;
/** 计划送货时间/提货时间 */
@@ -56,12 +56,12 @@ public class DispatchFeignDto extends BaseVOEntity{
private Date deliveryDate;
/** 最后装车时间 */
@ApiModelProperty("最后装车时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "最后装车时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date loadDate;
/** 发车日期 */
@ApiModelProperty("发车日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发车日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date departureDate;
/** 接车日期（入库时间） */
@@ -191,12 +191,12 @@ public class DispatchFeignDto extends BaseVOEntity{
private Long transportStatus;
/** 到达时间 */
@ApiModelProperty("到达时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date arriveDate;
/** 实际提货/送货时间 */
@ApiModelProperty("实际提货/送货时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "实际提货/送货时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date actualDeliveryDate;
@ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）")
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
+9 -9
View File
@@ -89,12 +89,12 @@ public class ReconciliationDTO extends BaseVOEntity{
private String waybillSourceName;
@ApiModelProperty("对账起始日")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd")
private Date reconciliationStart;
@ApiModelProperty("对账结束日")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd")
private Date reconciliationEnd;
@@ -186,7 +186,7 @@ public class ReconciliationDTO extends BaseVOEntity{
private Integer waybillVerifyFlag;
@ApiModelProperty("标记核实时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date waybillVerifyTime;
@@ -202,27 +202,27 @@ public class ReconciliationDTO extends BaseVOEntity{
private Long invoiceInfoId;
@ApiModelProperty("核销时间开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "核销时间开始", width = 30, dateFormat = "yyyy-MM-dd")
private Date collectionTimeStart;
@ApiModelProperty("核销时间结束")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "核销时间结束", width = 30, dateFormat = "yyyy-MM-dd")
private Date collectionTimeEnd;
@ApiModelProperty("创建时间开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd")
private String createTimeStart;
@ApiModelProperty("创建时间结束")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd")
private String createTimeEnd;
@ApiModelProperty("审核时间开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd")
private Date authTimeStart;
@ApiModelProperty("审核时间结束")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间结束", width = 30, dateFormat = "yyyy-MM-dd")
private Date authTimeEnd;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class ServiceBillDO extends BaseVOEntity {
private Date signTime;
@ApiModelProperty("交账时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDTO.java
+7 -7
View File
@@ -45,10 +45,10 @@ public class UserDTO extends BaseVOEntity {
private String userIdcardNumber;
@ApiModelProperty(name = "身份证号加密")
private String userIdcardNumberDes;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期自")
private Date userIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期至")
private Date userIdcardDateTo;
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
@@ -79,7 +79,7 @@ public class UserDTO extends BaseVOEntity {
private String userWechatSessionKey;
@ApiModelProperty(name = "密码登录错误次数")
private Integer passwordWrongTimes;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "最近一次登录时间")
private Date lastLoginTime;
@ApiModelProperty(name = "最近一次登录IP")
@@ -92,15 +92,15 @@ public class UserDTO extends BaseVOEntity {
private Integer userAuthStatus;
@ApiModelProperty(name = "用户审核人用户姓名")
private String userAuthByUsername;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户审核时间")
private Date userAuthTime;
@ApiModelProperty(name = "加入黑名单备注（解除时需要清空）")
private String userStatusRemark;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户状态更新时间")
private Date userStatusTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private Date userBirthday;
@ApiModelProperty(name = "用户住址信息")
@@ -149,4 +149,4 @@ public class UserDTO extends BaseVOEntity {
private List<Long> userIds;
@ApiModelProperty(name = "菜单表ID")
public Long permissionMenuId;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDriverDTO.java
+13 -13
View File
@@ -36,15 +36,15 @@ public class UserDriverDTO {
@ApiModelProperty(name = "驾驶证发证机关")
private String driverCertificationAuthority;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "初次领证日期")
private Date driverLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期开始日期")
private Date driverLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期到期日期")
private Date driverLicenseDateTo;
@@ -75,15 +75,15 @@ public class UserDriverDTO {
@ApiModelProperty(name = "从业资格证类别名称")
private String driverWorkLicenseTypeName;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证初次领证日期")
private Date driverWorkLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期开始日期")
private Date driverWorkLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期到期日期")
private Date driverWorkLicenseDateTo;
@@ -102,10 +102,10 @@ public class UserDriverDTO {
@ApiModelProperty(name = "经营许可证业户名称")
private String driverBusinessLicenseOwner;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "经营许可证有效期开始日期")
private Date driverBusinessLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "经营许可证有效期到期日期")
private Date driverBusinessLicenseDateTo;
@@ -130,11 +130,11 @@ public class UserDriverDTO {
@ApiModelProperty(name = "企业注册地址")
private String driverEnterpriseAddress;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业执照有效期开始日期")
private Date driverEnterpriseLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业执照有效期到期日期")
private Date driverEnterpriseLicenseDateTo;
@@ -156,11 +156,11 @@ public class UserDriverDTO {
@ApiModelProperty(name = "法人身份证号")
private String driverCorpIdcardNumber;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期开始日期")
private Date driverCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期结束日期")
private Date driverCorpIdcardDateTo;
@@ -205,4 +205,4 @@ public class UserDriverDTO {
@ApiModelProperty(value = "绑定来源 1-新增，2-绑定接口")
private Integer bindSource;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class CapitalFlowReport extends BaseVOEntity{
private Integer reportStatus;
@ApiModelProperty("上报日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date reportTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/DriverReport.java
+8 -8
View File
@@ -59,22 +59,22 @@ public class DriverReport extends BaseVOEntity {
private String remark;
@ApiModelProperty("驾驶证有效期自")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "驾驶证有效期自", width = 30, dateFormat = "yyyy-MM-dd")
private Date validPeriodFrom;
@ApiModelProperty("驾驶证有效期至")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "驾驶证有效期至", width = 30, dateFormat = "yyyy-MM-dd")
private Date validPeriodTo;
@ApiModelProperty("身份证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date idCardPeriodFrom;
@ApiModelProperty("身份证有效期结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date idCardPeriodTo;
@@ -83,7 +83,7 @@ public class DriverReport extends BaseVOEntity {
private Integer idCardIsEndless;
@ApiModelProperty("首次驾照签发日期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "首次驾照签发日期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date icenseFirstGetDate;
@@ -92,7 +92,7 @@ public class DriverReport extends BaseVOEntity {
private Integer reportStatus;
@ApiModelProperty("上报日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date reportTime;
@@ -105,7 +105,7 @@ public class DriverReport extends BaseVOEntity {
private Integer verifyStatus;
@ApiModelProperty("信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date verifyTime;
@@ -163,4 +163,4 @@ public class DriverReport extends BaseVOEntity {
@ApiModelProperty("操作类型(1- 新增 2-绑定车辆 3-解绑车辆)")
private Integer typeFlag;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/TransportNoteReport.java
+10 -10
View File
@@ -48,12 +48,12 @@ public class TransportNoteReport extends BaseVOEntity{
private String waybillId;
@ApiModelProperty("运单生成时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "运单生成时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date consignmentDateTime;
@ApiModelProperty("上报时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date sendToProDateTime;
@@ -62,12 +62,12 @@ public class TransportNoteReport extends BaseVOEntity{
private String businessTypeCode;
@ApiModelProperty("发货日期时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发货日期时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date dispatchActualDateTime;
@ApiModelProperty("收货日期时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "收货日期时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goodsReceiptDateTime;
@@ -244,7 +244,7 @@ public class TransportNoteReport extends BaseVOEntity{
private Integer reportStatus;
@ApiModelProperty("上报日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date reportTime;
@@ -257,7 +257,7 @@ public class TransportNoteReport extends BaseVOEntity{
private Integer verifyStatus;
@ApiModelProperty("信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date verifyTime;
@@ -270,7 +270,7 @@ public class TransportNoteReport extends BaseVOEntity{
private Integer flowReportStatus;
@ApiModelProperty("上报日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date flowReportTime;
@@ -283,7 +283,7 @@ public class TransportNoteReport extends BaseVOEntity{
private Integer flowVerifyStatus;
@ApiModelProperty("信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date flowVerifyTime;
@@ -312,7 +312,7 @@ public class TransportNoteReport extends BaseVOEntity{
private String onlineFileUrl;
@ApiModelProperty("合同签订时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同签订时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date settlementTime;
@@ -349,4 +349,4 @@ public class TransportNoteReport extends BaseVOEntity{
private String belongSystem;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/VehicleReport.java
+4 -4
View File
@@ -87,7 +87,7 @@ public class VehicleReport extends BaseVOEntity {
private Date issueDate;
@ApiModelProperty("道路运输许可证过期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "道路运输许可证过期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date transportLicenseExpireDate;
@@ -124,7 +124,7 @@ public class VehicleReport extends BaseVOEntity {
private Integer reportStatus;
@ApiModelProperty("上报日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date reportTime;
@@ -137,7 +137,7 @@ public class VehicleReport extends BaseVOEntity {
private Integer verifyStatus;
@ApiModelProperty("车辆信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "车辆信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date verifyTime;
@@ -198,4 +198,4 @@ public class VehicleReport extends BaseVOEntity {
private String belongSystem;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java
+2 -2
View File
@@ -178,7 +178,7 @@ public class Order extends BaseVOEntity{
private BigDecimal commissionCharges;
@ApiModelProperty("放款时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "放款时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date loanTime;
@@ -263,7 +263,7 @@ public class Order extends BaseVOEntity{
private String deliveryRemark;
@ApiModelProperty("预约提货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "预约提货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date sendCarStartTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java
+5 -5
View File
@@ -87,17 +87,17 @@ public class ContractManagePO extends BaseVOEntity{
private Integer accountingPeriod;
@ApiModelProperty("合同签订日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date signingDate;
@ApiModelProperty("合同生效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date effectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date expirationDate;
@@ -160,7 +160,7 @@ public class ContractManagePO extends BaseVOEntity{
private Integer automaticFlag;
@ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date paymentDate;
@ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
@@ -169,4 +169,4 @@ public class ContractManagePO extends BaseVOEntity{
@ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
private Integer transportationCosts;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java
+7 -7
View File
@@ -38,12 +38,12 @@ public class DispatchPo extends BaseVOEntity {
private Long dispatchType;
/** 调度配（派）车日期 */
@ApiModelProperty("调度配（派）车日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "调度配", readConverterExp = "派=")
private Date dispatchDate;
/** 计划发车日期 */
@ApiModelProperty("计划发车日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计划发车日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date planDepartureDate;
/** 计划送货时间/提货时间 */
@@ -53,17 +53,17 @@ public class DispatchPo extends BaseVOEntity {
private Date deliveryDate;
/** 最后装车时间 */
@ApiModelProperty("最后装车时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "最后装车时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date loadDate;
/** 发车日期 */
@ApiModelProperty("发车日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发车日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date departureDate;
/** 接车日期（入库时间） */
@ApiModelProperty("接车日期（入库时间）")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "接车日期", readConverterExp = "入=库时间")
private Date pickUpDate;
/** 寄件(发站)网点 */
@@ -187,12 +187,12 @@ public class DispatchPo extends BaseVOEntity {
private Long transportStatus;
/** 到达时间 */
@ApiModelProperty("到达时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date arriveDate;
/** 实际提货/送货时间 */
@ApiModelProperty("实际提货/送货时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "实际提货/送货时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date actualDeliveryDate;
@ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）")
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java
+1 -1
View File
@@ -274,7 +274,7 @@ public class OrderVerificationPo extends BaseVOEntity{
private String deliveryRemark;
@ApiModelProperty("预约提货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "预约提货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date sendCarStartTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserAuthPo.java
+3 -3
View File
@@ -18,10 +18,10 @@ public class UserAuthPo {
@ApiModelProperty(name = "身份证号")
private String userIdcardNumber;
@ApiModelProperty(name = "身份证有效期自")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String userIdcardDateFrom;
@ApiModelProperty(name = "身份证有效期至")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String userIdcardDateTo;
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
private Integer userIdcardLong;
@@ -46,4 +46,4 @@ public class UserAuthPo {
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverAuthPo.java
+7 -7
View File
@@ -22,15 +22,15 @@ public class UserDriverAuthPo {
@ApiModelProperty(name = "驾驶证发证机关")
private String driverCertificationAuthority;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "初次领证日期")
private String driverLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期开始日期")
private String driverLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期到期日期")
private String driverLicenseDateTo;
@@ -61,15 +61,15 @@ public class UserDriverAuthPo {
@ApiModelProperty(name = "从业资格证类别名称")
private String driverWorkLicenseTypeName;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证初次领证日期")
private String driverWorkLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期开始日期")
private String driverWorkLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期到期日期")
private String driverWorkLicenseDateTo;
@@ -98,4 +98,4 @@ public class UserDriverAuthPo {
@ApiModelProperty(name = "核定载质量")
private BigDecimal vehicleApprovedLoadQuantity;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterpriseAuthPo.java
+7 -7
View File
@@ -40,12 +40,12 @@ public class UserDriverEnterpriseAuthPo{
private String driverBusinessLicenseOwner;
/** 经营许可证有效期开始日期 */
@ApiModelProperty("经营许可证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverBusinessLicenseDateFrom;
/** 经营许可证有效期到期日期 */
@ApiModelProperty("经营许可证有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverBusinessLicenseDateTo;
/** 经营许可证是否长期：0-无状态，1-是，2-否 */
@@ -74,12 +74,12 @@ public class UserDriverEnterpriseAuthPo{
private String driverEnterpriseAddress;
/** 企业营业执照有效期开始日期 */
@ApiModelProperty("企业营业执照有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseLicenseDateFrom;
/** 企业营业执照有效期到期日期 */
@ApiModelProperty("企业营业执照有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseLicenseDateTo;
/** 企业营业执照是否长期：0-无状态，1-是，2-否 */
@@ -112,12 +112,12 @@ public class UserDriverEnterpriseAuthPo{
private String driverCorpIdcardNumber;
/** 法人身份证有效期开始日期 */
@ApiModelProperty("法人身份证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverCorpIdcardDateFrom;
/** 法人身份证有效期结束日期 */
@ApiModelProperty("法人身份证有效期结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverCorpIdcardDateTo;
/** 法人身份证是否长期：0-无状态，1-是，2-否 */
@@ -144,4 +144,4 @@ public class UserDriverEnterpriseAuthPo{
private String driverEnterpriseFillName;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterprisePo.java
+8 -8
View File
@@ -41,12 +41,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity {
private String driverBusinessLicenseOwner="";
/** 经营许可证有效期开始日期 */
@ApiModelProperty("经营许可证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverBusinessLicenseDateFrom;
/** 经营许可证有效期到期日期 */
@ApiModelProperty("经营许可证有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverBusinessLicenseDateTo;
/** 经营许可证是否长期：0-无状态，1-是，2-否 */
@@ -75,12 +75,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity {
private String driverEnterpriseAddress="";
/** 企业营业执照有效期开始日期 */
@ApiModelProperty("企业营业执照有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseLicenseDateFrom;
/** 企业营业执照有效期到期日期 */
@ApiModelProperty("企业营业执照有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseLicenseDateTo;
/** 企业营业执照是否长期：0-无状态，1-是，2-否 */
@@ -109,12 +109,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity {
private String driverCorpIdcardNumber="";
/** 法人身份证有效期开始日期 */
@ApiModelProperty("法人身份证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverCorpIdcardDateFrom;
/** 法人身份证有效期结束日期 */
@ApiModelProperty("法人身份证有效期结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverCorpIdcardDateTo;
/** 法人身份证是否长期：0-无状态，1-是，2-否 */
@@ -141,7 +141,7 @@ public class UserDriverEnterprisePo extends BaseVOEntity {
private String driverEnterpriseFillName="";
/** 承运人企业认证时间 */
@ApiModelProperty("承运人企业认证时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseFillTime;
@@ -165,4 +165,4 @@ public class UserDriverEnterprisePo extends BaseVOEntity {
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java
+17 -17
View File
@@ -34,10 +34,10 @@ public class UserDriverListPo {
private String organizationName = "";
@ApiModelProperty(name = "身份证号")
private String userIdcardNumber = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期自")
private String userIdcardDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期至")
private String userIdcardDateTo = "";
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
@@ -57,7 +57,7 @@ public class UserDriverListPo {
private String driverWorkLicenseAuthorityName = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期到期日期")
private String driverWorkLicenseDateTo = "";
@@ -79,18 +79,18 @@ public class UserDriverListPo {
private String driverBusinessLicenseOwner="";
/** 经营许可证有效期开始日期 */
@ApiModelProperty("经营许可证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String driverBusinessLicenseDateFrom="";
/** 经营许可证有效期到期日期 */
@ApiModelProperty("经营许可证有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String driverBusinessLicenseDateTo="";
@ApiModelProperty("企业营业执照有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String driverEnterpriseLicenseDateFrom="";
/** 企业营业执照有效期到期日期 */
@ApiModelProperty("企业营业执照有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String driverEnterpriseLicenseDateTo="";
/** 企业营业执照是否长期：0-无状态，1-是，2-否 */
@ApiModelProperty("企业营业执照是否长期：0-无状态，1-是，2-否")
@@ -137,7 +137,7 @@ public class UserDriverListPo {
* 承运人企业认证时间
*/
@ApiModelProperty("承运人企业认证时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date driverEnterpriseFillTime;
@@ -153,7 +153,7 @@ public class UserDriverListPo {
@ApiModelProperty("承运人车队长认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效")
private Integer driverCaptainFill = 0;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期到期日期")
private Date driverLicenseDateTo;
@@ -172,7 +172,7 @@ public class UserDriverListPo {
@ApiModelProperty(name = "经营许可证件校验状态（0-无状态，1-未核验，2-核验通过，3-核验失败）")
private Integer driverBusinessLicenseCheckoutStatus = 0;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期开始日期")
private String driverWorkLicenseDateFrom;
@@ -182,14 +182,14 @@ public class UserDriverListPo {
@ApiModelProperty(name = "从业资格证主页图片地址")
private String driverWorkLicenseFrontUrl;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期开始日期")
private Date driverLicenseDateFrom;
@ApiModelProperty(name = "驾驶证档案编号")
private String driverLicenseNumber;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "初次领证日期")
private Date driverLicenseFirstDate;
@@ -208,7 +208,7 @@ public class UserDriverListPo {
@ApiModelProperty(name = "详细地址")
private String userAreaAddress = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
@@ -247,11 +247,11 @@ public class UserDriverListPo {
@ApiModelProperty(name = "法人身份证手持照片")
private String driverCorpIdcardInhandUrl;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期开始日期")
private Date driverCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期结束日期")
private Date driverCorpIdcardDateTo;
@@ -267,7 +267,7 @@ public class UserDriverListPo {
@ApiModelProperty(name = "从业资格证类别名称")
private String driverWorkLicenseTypeName;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证初次领证日期")
private Date driverWorkLicenseFirstDate;
@@ -312,4 +312,4 @@ public class UserDriverListPo {
@ApiModelProperty(name = "")
private String wlhydriverId;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java
+10 -10
View File
@@ -46,17 +46,17 @@ public class UserDriverPo {
@ApiModelProperty(name = "备注/用户基本信息")
private String userRemark = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
@ApiModelProperty(name = "用户头像")
private String avatar= "";
@ApiModelProperty(name = "身份证号")
private String userIdcardNumber = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期自")
private String userIdcardDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期至")
private String userIdcardDateTo = "";
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
@@ -80,15 +80,15 @@ public class UserDriverPo {
@ApiModelProperty(name = "驾驶证发证机关")
private String driverCertificationAuthority = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "初次领证日期")
private String driverLicenseFirstDate = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期开始日期")
private String driverLicenseDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期到期日期")
private String driverLicenseDateTo = "";
@@ -119,15 +119,15 @@ public class UserDriverPo {
@ApiModelProperty(name = "从业资格证类别名称")
private String driverWorkLicenseTypeName = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证初次领证日期")
private String driverWorkLicenseFirstDate = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期开始日期")
private String driverWorkLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期到期日期")
private String driverWorkLicenseDateTo = "";
@@ -210,4 +210,4 @@ public class UserDriverPo {
private String promoCode;
@ApiModelProperty(value = "公司名称")
private String companyName = "";
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java
+3 -3
View File
@@ -47,10 +47,10 @@ public class UserPo {
@ApiModelProperty(name = "身份证号加密")
private String userIdcardNumberDes = "";
@ApiModelProperty(name = "身份证有效期自")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String userIdcardDateFrom = "";
@ApiModelProperty(name = "身份证有效期至")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String userIdcardDateTo = "";
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
private Integer userIdcardLong = 0;
@@ -103,7 +103,7 @@ public class UserPo {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(name = "用户状态更新时间")
private String userStatusTime = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
@ApiModelProperty(name = "用户住址信息")
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperAuthPo.java
+5 -5
View File
@@ -29,11 +29,11 @@ public class UserShipperAuthPo {
@ApiModelProperty(name = "企业注册地址")
private String shipperEnterpriseAddress;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限起")
private String shipperEnterpriseLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限止")
private String shipperEnterpriseLicenseDateTo;
@@ -56,10 +56,10 @@ public class UserShipperAuthPo {
private String shipperCorpLegalName;
@ApiModelProperty(name = "法人身份证号")
private String shipperCorpIdcardNumber;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期自")
private String shipperCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
private String shipperCorpIdcardDateTo;
@ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否")
@@ -86,4 +86,4 @@ public class UserShipperAuthPo {
@ApiModelProperty(name = "托运人发货企业审核原因")
private String shipperEnterpriseFillRemark;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java
+8 -10
View File
@@ -33,7 +33,7 @@ public class UserShipperPo {
private String userIdcardBackUrl = "";
@ApiModelProperty(name = "手持身份证")
private String userIdcardInhandUrl = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
@ApiModelProperty(name = "手机号码")
@@ -47,10 +47,10 @@ public class UserShipperPo {
private String roleName = "";
@ApiModelProperty(name = "身份证号")
private String userIdcardNumber = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期自")
private String userIdcardDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期至")
private String userIdcardDateTo = "";
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
@@ -82,11 +82,11 @@ public class UserShipperPo {
@ApiModelProperty(name = "企业注册地址")
private String shipperEnterpriseAddress = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限起")
private String shipperEnterpriseLicenseDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限止")
private String shipperEnterpriseLicenseDateTo = "";
@@ -132,10 +132,10 @@ public class UserShipperPo {
private String shipperCorpIdcardNumber = "";
@ApiModelProperty(name = "法人身份证号加密")
private String shipperCorpIdcardNumberDes = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期自")
private String shipperCorpIdcardDateFrom = "";
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
private String shipperCorpIdcardDateTo = "";
@ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否")
@@ -271,6 +271,4 @@ public class UserShipperPo {
@ApiModelProperty("货主code")
private String roleCodeShipper;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/report/UserDriverReportPo.java
+10 -10
View File
@@ -48,17 +48,17 @@ public class UserDriverReportPo {
@ApiModelProperty(name = "备注/用户基本信息")
private String userRemark;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday;
@ApiModelProperty(name = "用户头像")
private String avatar;
@ApiModelProperty(name = "身份证号")
private String userIdcardNumber;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期自")
private String userIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "身份证有效期至")
private String userIdcardDateTo;
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
@@ -85,15 +85,15 @@ public class UserDriverReportPo {
@ApiModelProperty(name = "驾驶证发证机关")
private String driverCertificationAuthority;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "初次领证日期")
private String driverLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期开始日期")
private String driverLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "驾驶证有效期到期日期")
private String driverLicenseDateTo;
@@ -124,15 +124,15 @@ public class UserDriverReportPo {
@ApiModelProperty(name = "从业资格证类别名称")
private String driverWorkLicenseTypeName;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证初次领证日期")
private String driverWorkLicenseFirstDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期开始日期")
private String driverWorkLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "从业资格证有效期到期日期")
private String driverWorkLicenseDateTo;
@@ -193,4 +193,4 @@ public class UserDriverReportPo {
}
}