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-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialCommonFeign.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class MaterialCommonFeign extends BaseVOEntity{
private String dangerLevelName;
@ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date productionTime;
@ApiModelProperty("失效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date expirationTime;
@@ -101,4 +101,4 @@ public class MaterialCommonFeign extends BaseVOEntity{
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class StockOutOrder extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class StockOutOrder extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class StockOutOrder extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java
+5 -5
View File
@@ -42,10 +42,10 @@ public class UserUpdateDTO 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-否")
@@ -89,15 +89,15 @@ public class UserUpdateDTO extends BaseVOEntity {
private int 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 = "用户住址信息")
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 {
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java
+4 -4
View File
@@ -92,17 +92,17 @@ public class ContractManage 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;
@@ -162,7 +162,7 @@ public class ContractManage extends BaseVOEntity{
private Integer automaticFlag;
@ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date paymentDate;
@ApiModelProperty(name = "出账天数")
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java
+3 -3
View File
@@ -90,17 +90,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;
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java
+4 -4
View File
@@ -87,17 +87,17 @@ public class ContractManageDO 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;
@@ -196,7 +196,7 @@ public class ContractManageDO extends BaseVOEntity{
private Integer automaticFlag;
@ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date paymentDate;
@ApiModelProperty(name = "出账天数")
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java
+3 -3
View File
@@ -83,12 +83,12 @@ public class ContractManageDetail extends BaseVOEntity{
private String billingAttributesCode;
@ApiModelProperty("合同有效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectEffectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectExpirationDate;
@@ -98,4 +98,4 @@ public class ContractManageDetail extends BaseVOEntity{
@ApiModelProperty("单据类型")
private String documentType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class ContractManageDetailPO extends BaseVOEntity{
private String billingAttributesCode;
@ApiModelProperty("合同有效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectEffectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectExpirationDate;
@@ -97,4 +97,4 @@ public class ContractManageDetailPO extends BaseVOEntity{
@ApiModelProperty("单据类型")
private String documentType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class ContractManageDetailDO extends BaseVOEntity{
private String billingAttributesCode;
@ApiModelProperty("合同有效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectEffectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectExpirationDate;
@@ -102,4 +102,4 @@ public class ContractManageDetailDO extends BaseVOEntity{
@ApiModelProperty("单据类型")
private String documentType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java
+3 -3
View File
@@ -56,18 +56,18 @@ public class LeaseDO extends BaseVOEntity{
private BigDecimal leaseArea;
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startDate;
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endDate;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("当前时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date time;
@ApiModelProperty("费用类别")
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/entity/ProjectManage.java
+3 -3
View File
@@ -63,12 +63,12 @@ public class ProjectManage extends BaseVOEntity{
private Integer projectStats;
@ApiModelProperty("项目开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginDate;
@ApiModelProperty("项目结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
@@ -91,4 +91,4 @@ public class ProjectManage extends BaseVOEntity{
@ApiModelProperty("备注")
private String remark;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/po/ProjectManagePO.java
+3 -3
View File
@@ -62,12 +62,12 @@ public class ProjectManagePO extends BaseVOEntity{
private Integer projectStats;
@ApiModelProperty("项目开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginDate;
@ApiModelProperty("项目结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
@@ -90,4 +90,4 @@ public class ProjectManagePO extends BaseVOEntity{
@ApiModelProperty("备注")
private String remark;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/todo/ProjectManageDO.java
+3 -3
View File
@@ -62,12 +62,12 @@ public class ProjectManageDO extends BaseVOEntity{
private Integer projectStats;
@ApiModelProperty("项目开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginDate;
@ApiModelProperty("项目结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
@@ -114,4 +114,4 @@ public class ProjectManageDO extends BaseVOEntity{
private String projectEndTimeStart;
@ApiModelProperty(name = "项目结束时间查询条件结束日期")
private String projectEndTimeEnd;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/entity/ScheduledTask.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ScheduledTask extends BaseVOEntity {
private Integer retryCount;
@ApiModelProperty("计划执行时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date executeTime;
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTaskLog/entity/ScheduledTaskLog.java
+1 -1
View File
@@ -36,6 +36,6 @@ public class ScheduledTaskLog extends BaseVOEntity {
private String taskStatus;
@ApiModelProperty("执行时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date executeTime;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageDTO.java
+4 -4
View File
@@ -87,17 +87,17 @@ public class ContractManageDTO 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;
@@ -187,7 +187,7 @@ public class ContractManageDTO extends BaseVOEntity{
private Integer automaticFlag;
@ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date paymentDate;
@ApiModelProperty(name = "出账天数")
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java
+3 -3
View File
@@ -81,12 +81,12 @@ public class ContractManageDetailDTO extends BaseVOEntity{
private String billingAttributesCode;
@ApiModelProperty("合同有效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectEffectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectExpirationDate;
@@ -102,4 +102,4 @@ public class ContractManageDetailDTO extends BaseVOEntity{
@ApiModelProperty("单据类型")
private String documentType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/projectManage/ProjectManageDTO.java
+3 -3
View File
@@ -61,12 +61,12 @@ public class ProjectManageDTO extends BaseVOEntity{
private Integer projectStats;
@ApiModelProperty("项目开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginDate;
@ApiModelProperty("项目结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
@@ -117,4 +117,4 @@ public class ProjectManageDTO extends BaseVOEntity{
private String projectEndTimeStart;
@ApiModelProperty(name = "项目结束时间查询条件结束日期")
private String projectEndTimeEnd;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java
+2 -2
View File
@@ -41,7 +41,7 @@ public class SysCompanyApp extends BaseEntity
private String appVersion;
/** 上架时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上架时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDatetime;
@@ -149,4 +149,4 @@ public class SysCompanyApp extends BaseEntity
.append("delFlag", getDelFlag())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java
+3 -3
View File
@@ -44,12 +44,12 @@ public class SysEquipmentGps extends BaseEntity
private Integer delFlag;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDatetime;
/** 修改时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDatetime;
@@ -149,4 +149,4 @@ public class SysEquipmentGps extends BaseEntity
.append("updateDatetime", getUpdateDatetime())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java
+3 -3
View File
@@ -44,12 +44,12 @@ public class SysEquipmentPrinter extends BaseEntity
private Integer delFlag;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDate;
@@ -149,4 +149,4 @@ public class SysEquipmentPrinter extends BaseEntity
.append("updateDate", getUpdateDate())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java
+3 -3
View File
@@ -37,14 +37,14 @@ public class SysMsgCenter extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 更新人 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
/** 状态 */
@@ -58,4 +58,4 @@ public class SysMsgCenter extends BaseEntity
private String msgType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java
+3 -3
View File
@@ -37,7 +37,7 @@ public class SysMsgPush extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 删除状态 */
@@ -47,7 +47,7 @@ public class SysMsgPush extends BaseEntity
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java
+8 -8
View File
@@ -37,11 +37,11 @@ public class SysMsgPushDTO extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 推送时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date pushTime;
/** 删除状态 */
@@ -51,21 +51,21 @@ public class SysMsgPushDTO extends BaseEntity
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
/* 创建时间搜索 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startCreateTime;
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endCreateTime;
/* 推送时间搜索 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startPushTime;
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endPushTime;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEnterprise.java
+8 -8
View File
@@ -44,12 +44,12 @@ public class UserDriverEnterprise 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-否 */
@@ -78,12 +78,12 @@ public class UserDriverEnterprise 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-否 */
@@ -116,12 +116,12 @@ public class UserDriverEnterprise 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-否 */
@@ -146,7 +146,7 @@ public class UserDriverEnterprise extends BaseVOEntity{
private Integer driverEnterpriseFill;
/** 承运人企业认证时间 */
@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;
@@ -184,4 +184,4 @@ public class UserDriverEnterprise extends BaseVOEntity{
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java
+7 -7
View File
@@ -42,15 +42,15 @@ public class UserDriverEntity extends BaseVOEntity {
@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;
@@ -81,15 +81,15 @@ public class UserDriverEntity extends BaseVOEntity {
@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;
@@ -149,4 +149,4 @@ public class UserDriverEntity extends BaseVOEntity {
*/
@ApiModelProperty(name = "组织名称")
private String organizationName;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
+5 -5
View File
@@ -47,11 +47,11 @@ public class UserShipperEntity extends BaseVOEntity {
@ApiModelProperty(name = "企业注册地址")
private String shipperEnterpriseAddress;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限起")
private Date shipperEnterpriseLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限止")
private Date shipperEnterpriseLicenseDateTo;
@@ -84,11 +84,11 @@ public class UserShipperEntity extends BaseVOEntity {
@ApiModelProperty(name = "法人身份证号加密")
private String shipperCorpIdcardNumberDes;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期自")
private Date shipperCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
private Date shipperCorpIdcardDateTo;
@@ -275,4 +275,4 @@ public class UserShipperEntity extends BaseVOEntity {
@ApiModelProperty(name = "推送人姓名")
private String pushByName;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/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;
@@ -56,4 +56,4 @@ public class UserAuthPo {
@ApiModelProperty("身份证发证机关")
private String certificationAuthority;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/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;
@@ -63,15 +63,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;
@@ -109,4 +109,4 @@ public class UserDriverAuthPo {
@ApiModelProperty(name = "核定载质量")
private BigDecimal vehicleApprovedLoadQuantity;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverCaptainAuthPo.java
+3 -3
View File
@@ -28,10 +28,10 @@ public class UserDriverCaptainAuthPo {
@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;
@@ -58,4 +58,4 @@ public class UserDriverCaptainAuthPo {
private String userAuthStatusName;
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterpriseAuthPo.java
+7 -7
View File
@@ -41,12 +41,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-否 */
@@ -76,12 +76,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-否 */
@@ -115,12 +115,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-否 */
@@ -165,4 +165,4 @@ public class UserDriverEnterpriseAuthPo {
@ApiModelProperty(value = "法人证件类型名称")
private String legalPersonIdName;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterprisePo.java
+8 -8
View File
@@ -42,12 +42,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-否 */
@@ -76,12 +76,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-否 */
@@ -114,12 +114,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-否 */
@@ -145,7 +145,7 @@ public class UserDriverEnterprisePo extends BaseVOEntity{
/** 承运人企业认证时间 */
@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;
@@ -189,4 +189,4 @@ public class UserDriverEnterprisePo extends BaseVOEntity{
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverInfoPO.java
+16 -16
View File
@@ -32,13 +32,13 @@ public class UserDriverInfoPO extends BaseVOEntity {
private String driverLicenseBackUrl = "";
@ApiModelProperty(name = "准驾车型名称")
private String driverAllowDrivingTypeName = "";
@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 = "";
@ApiModelProperty(name = "驾驶证是否长期：0-无状态，1-是，2-否")
@@ -60,13 +60,13 @@ public class UserDriverInfoPO extends BaseVOEntity {
private String driverWorkLicenseNumber = "";
@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 = "";
@ApiModelProperty(name = "从业资格证是否长期：0-无状态，1-是，2-否")
@@ -86,15 +86,15 @@ public class UserDriverInfoPO extends BaseVOEntity {
private String userName = "";
@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-否")
private Integer userIdcardLong;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "用户生日")
private String userBirthday = "";
@ApiModelProperty(name = "县区名称")
@@ -120,11 +120,11 @@ public class UserDriverInfoPO extends BaseVOEntity {
@ApiModelProperty("企业注册电话")
private String driverEnterprisePhone="";
@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;
@ApiModelProperty("企业营业执照是否长期：0-无状态，1-是，2-否")
@@ -145,11 +145,11 @@ public class UserDriverInfoPO extends BaseVOEntity {
@ApiModelProperty("法人身份证号")
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;
@ApiModelProperty("法人身份证是否长期：0-无状态，1-是，2-否")
@@ -164,11 +164,11 @@ public class UserDriverInfoPO extends BaseVOEntity {
@ApiModelProperty("经营许可证业户名称")
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;
@ApiModelProperty("经营许可证是否长期：0-无状态，1-是，2-否")
@@ -177,4 +177,4 @@ public class UserDriverInfoPO extends BaseVOEntity {
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java
+10 -10
View File
@@ -56,17 +56,17 @@ public class UserDriverPo extends BaseVOEntity {
@ApiModelProperty(name = "部门ID")
private String departmentId;
@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-否")
@@ -90,15 +90,15 @@ public class UserDriverPo extends BaseVOEntity {
@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 = "";
@NeedSetValue
@@ -129,15 +129,15 @@ public class UserDriverPo extends BaseVOEntity {
@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 = "";
@@ -237,4 +237,4 @@ public class UserDriverPo extends BaseVOEntity {
@ApiModelProperty(name = "经营许可证号")
private String driverBusinessLicenseNumber;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperAuthPo.java
+5 -5
View File
@@ -33,11 +33,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;
@@ -61,10 +61,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-否")
@@ -121,4 +121,4 @@ public class UserShipperAuthPo {
@ApiModelProperty(name = "成立日期")
private String establishDate;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java
+8 -8
View File
@@ -33,7 +33,7 @@ public class UserShipperPo implements Serializable {
@NeedSetValue
@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 implements Serializable {
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 implements Serializable {
@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 = "";
@@ -137,10 +137,10 @@ public class UserShipperPo implements Serializable {
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-否")
@@ -335,4 +335,4 @@ public class UserShipperPo implements Serializable {
@ApiModelProperty(value = "推送人姓名")
private String pushByName;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java
+11 -11
View File
@@ -57,15 +57,15 @@ public class UserDriverDO extends UserDO {
@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;
@@ -98,15 +98,15 @@ public class UserDriverDO extends UserDO {
@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;
@@ -176,11 +176,11 @@ public class UserDriverDO extends UserDO {
private String driverBusinessLicenseNumber;
/** 经营许可证有效期开始日期 */
@ApiModelProperty("经营许可证有效期开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date driverBusinessLicenseDateFrom;
/** 经营许可证有效期到期日期 */
@ApiModelProperty("经营许可证有效期到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date driverBusinessLicenseDateTo;
/** 企业名称 */
@ApiModelProperty("企业名称")
@@ -189,12 +189,12 @@ public class UserDriverDO extends UserDO {
private String driverEnterpriseSocialCreditCode;
/** 企业营业执照有效期开始日期 */
@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;
@@ -292,4 +292,4 @@ public class UserDriverDO extends UserDO {
@ApiModelProperty("当前用户的组织是否开启排队")
private Integer isQueue;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverEnterpriseDo.java
+8 -8
View File
@@ -42,12 +42,12 @@ public class UserDriverEnterpriseDo extends UserDO{
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-否 */
@@ -77,12 +77,12 @@ public class UserDriverEnterpriseDo extends UserDO{
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-否 */
@@ -116,12 +116,12 @@ public class UserDriverEnterpriseDo extends UserDO{
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-否 */
@@ -149,7 +149,7 @@ public class UserDriverEnterpriseDo extends UserDO{
private Integer driverEnterpriseFill;
/** 承运人企业认证时间 */
@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;
@@ -215,4 +215,4 @@ public class UserDriverEnterpriseDo extends UserDO{
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
+7 -7
View File
@@ -45,11 +45,11 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "企业注册地址")
private String shipperEnterpriseAddress;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限起")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperEnterpriseLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限止")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperEnterpriseLicenseDateTo;
@@ -87,12 +87,12 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "法人身份证号加密")
private String shipperCorpIdcardNumberDes;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期自")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperCorpIdcardDateTo;
@@ -127,10 +127,10 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "货主审核原因")
private String shipperStatusRemark;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
private Date shipperCorpIdcardDateToStart;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
private Date shipperCorpIdcardDateToEnd;
@@ -315,4 +315,4 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "登录密码（6-20位）")
private String userPassword;
}
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
+6 -6
View File
@@ -53,10 +53,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-否")
@@ -91,7 +91,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 = "最近一次登录时间起")
@@ -116,15 +116,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 = "用户住址信息")
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java
+13 -13
View File
@@ -47,15 +47,15 @@ public class UserDriverDTO extends UserDTO {
@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;
@@ -88,15 +88,15 @@ public class UserDriverDTO extends UserDTO {
@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;
@@ -120,10 +120,10 @@ public class UserDriverDTO extends UserDTO {
@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;
@@ -149,11 +149,11 @@ public class UserDriverDTO extends UserDTO {
@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;
@@ -176,11 +176,11 @@ public class UserDriverDTO extends UserDTO {
@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;
@@ -316,4 +316,4 @@ public class UserDriverDTO extends UserDTO {
@ApiModelProperty(name = "车辆主体")
private String vehicleBody;
}
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverEnterpriseDto.java
+10 -10
View File
@@ -42,12 +42,12 @@ public class UserDriverEnterpriseDto extends UserDTO{
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-否 */
@@ -77,12 +77,12 @@ public class UserDriverEnterpriseDto extends UserDTO{
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-否 */
@@ -116,12 +116,12 @@ public class UserDriverEnterpriseDto extends UserDTO{
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-否 */
@@ -149,7 +149,7 @@ public class UserDriverEnterpriseDto extends UserDTO{
private Integer driverEnterpriseFill;
/** 承运人企业认证时间 */
@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;
/** 承运人企业认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效' */
@@ -158,7 +158,7 @@ public class UserDriverEnterpriseDto extends UserDTO{
private Integer driverEnterpriseInfoFill;
/** 承运人企业认证时间 */
@ApiModelProperty("承运人企业认证时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverEnterpriseInfoFillTime;
/** 承运人经营许可证认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效' */
@@ -167,7 +167,7 @@ public class UserDriverEnterpriseDto extends UserDTO{
private Integer driverBusinessLicenseFill;
/** 承运人经营许可证认证时间 */
@ApiModelProperty("承运人经营许可证认证时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "承运人经营许可证认证时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date driverBusinessLicenseFillTime;
@ApiModelProperty(name = "组织ID集合")
@@ -203,4 +203,4 @@ public class UserDriverEnterpriseDto extends UserDTO{
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
}
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java
+5 -5
View File
@@ -46,12 +46,12 @@ public class UserShipperDTO extends UserDTO {
@ApiModelProperty(name = "企业注册地址")
private String shipperEnterpriseAddress;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限起")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperEnterpriseLicenseDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "企业营业期限止")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperEnterpriseLicenseDateTo;
@@ -85,12 +85,12 @@ public class UserShipperDTO extends UserDTO {
@ApiModelProperty(name = "法人身份证号加密")
private String shipperCorpIdcardNumberDes;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期自")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperCorpIdcardDateFrom;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "法人身份证有效期止")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipperCorpIdcardDateTo;
@@ -256,4 +256,4 @@ public class UserShipperDTO extends UserDTO {
@ApiModelProperty(name = "登录密码（6-20位）")
private String userPassword;
}
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java
+5 -5
View File
@@ -42,10 +42,10 @@ public class UserUpdateDTO 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-否")
@@ -89,15 +89,15 @@ public class UserUpdateDTO extends BaseVOEntity {
private int 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 = "用户住址信息")
mhd-user-center/src/main/java/com/mhd/user/interfaces/facadeApi/Po/UserShipperAuthAppPo.java
+8 -8
View File
@@ -26,7 +26,7 @@ public class UserShipperAuthAppPo {
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 = "手机号码")
@@ -40,10 +40,10 @@ public class UserShipperAuthAppPo {
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-否")
@@ -75,11 +75,11 @@ public class UserShipperAuthAppPo {
@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 = "";
@@ -125,10 +125,10 @@ public class UserShipperAuthAppPo {
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-否")
@@ -163,4 +163,4 @@ public class UserShipperAuthAppPo {
@ApiModelProperty(name = "托运人发货企业审核原因")
private String shipperEnterpriseFillRemark="";
}
}
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java
+3 -3
View File
@@ -120,17 +120,17 @@ public class BillManage extends BaseVOEntity{
private String financialReviewOpinion;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
@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;
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java
+3 -3
View File
@@ -82,17 +82,17 @@ public class BillDetailPO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
+3 -3
View File
@@ -129,17 +129,17 @@ public class BillManagePO extends BaseVOEntity{
private String financialReviewOpinion;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
@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;
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java
+3 -3
View File
@@ -120,17 +120,17 @@ public class BillManageDO extends BaseVOEntity{
private String financialReviewOpinion;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
@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;
mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java
+3 -3
View File
@@ -52,17 +52,17 @@ public class BillingStatement extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java
+3 -3
View File
@@ -50,17 +50,17 @@ public class BillingStatementPO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java
+3 -3
View File
@@ -51,17 +51,17 @@ public class BillingStatementDO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class BusinessDocument extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("计费时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date billingTime;
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class BusinessDocumentPO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("计费时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date billingTime;
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class BusinessDocumentDO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("计费时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date billingTime;
mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManageDetailPO.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class ContractManageDetailPO extends BaseVOEntity{
private String billingAttributesCode;
@ApiModelProperty("合同有效日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectEffectiveDate;
@ApiModelProperty("合同到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date subjectExpirationDate;
@@ -97,4 +97,4 @@ public class ContractManageDetailPO extends BaseVOEntity{
@ApiModelProperty("单据类型")
private String documentType;
}
}
mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/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;
@@ -163,10 +163,10 @@ 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-承运商)")
private Integer principalType;
}
}
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java
+3 -3
View File
@@ -87,17 +87,17 @@ public class BillDetailDTO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java
+3 -3
View File
@@ -120,17 +120,17 @@ public class BillManageDTO extends BaseVOEntity{
private String financialReviewOpinion;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
@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;
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java
+3 -3
View File
@@ -52,17 +52,17 @@ public class BillingStatementDTO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("业务日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessDate;
@ApiModelProperty("周期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleBeginTime;
@ApiModelProperty("周期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cycleEndTime;
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
private String settlementEntity;
@ApiModelProperty("计费时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date billingTime;
mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class AccountTransferRecharge extends BaseVOEntity
private String accountTransferReviewer;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(name = "审核时间")
private Date transferReviewerTime;
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java
+2 -2
View File
@@ -65,12 +65,12 @@ public class BranchBill extends BaseVOEntity {
private Integer billStatus;
@ApiModelProperty("交账周期开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交账周期开始", width = 30, dateFormat = "yyyy-MM-dd")
private Date billTimeStart;
@ApiModelProperty("交账周期结束")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交账周期结束", width = 30, dateFormat = "yyyy-MM-dd")
private Date billTimeEnd;
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/entity/BusinessDocument.java
+4 -4
View File
@@ -118,7 +118,7 @@ public class BusinessDocument 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;
@@ -126,7 +126,7 @@ public class BusinessDocument 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;
@@ -165,7 +165,7 @@ public class BusinessDocument 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;
@@ -174,4 +174,4 @@ public class BusinessDocument extends BaseVOEntity{
@ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）")
private String mainOrderNumber;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/AccountsReceivableAppPO.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class AccountsReceivableAppPO extends BaseVOEntity{
private String vehicleLicensePlateNumber = "";
@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 receptionTime;
@@ -100,4 +100,4 @@ public class AccountsReceivableAppPO extends BaseVOEntity{
private String mailAreaName = "";
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentAppPO.java
+5 -5
View File
@@ -104,7 +104,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{
private String vehicleLicensePlateNumber = "";
@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 receptionTime;
@@ -124,7 +124,7 @@ public class BusinessDocumentAppPO 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")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date payTime;
@@ -133,7 +133,7 @@ public class BusinessDocumentAppPO 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")
@JsonSerialize(nullsUsing = DateNullToStringSerializer.class)
private Date waybillVerifyTime;
@@ -154,7 +154,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{
private String freightName = "";
@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_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentPO.java
+4 -4
View File
@@ -120,7 +120,7 @@ public class BusinessDocumentPO 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;
@@ -128,7 +128,7 @@ public class BusinessDocumentPO 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;
@@ -167,7 +167,7 @@ public class BusinessDocumentPO 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;
@@ -176,4 +176,4 @@ public class BusinessDocumentPO extends BaseVOEntity{
@ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）")
private String mainOrderNumber;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/todo/BusinessDocumentDO.java
+4 -4
View File
@@ -129,7 +129,7 @@ public class BusinessDocumentDO 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;
@@ -137,7 +137,7 @@ public class BusinessDocumentDO 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;
@@ -209,7 +209,7 @@ public class BusinessDocumentDO 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;
@@ -218,4 +218,4 @@ public class BusinessDocumentDO extends BaseVOEntity{
@ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）")
private String mainOrderNumber;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java
+3 -3
View File
@@ -125,12 +125,12 @@ public class BusinessDocumentDetali extends BaseVOEntity{
// private Integer payStatusShipper;
// @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;
//
// @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;
@@ -170,4 +170,4 @@ public class BusinessDocumentDetali extends BaseVOEntity{
@ApiModelProperty("司机姓名")
private String driver;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliPO.java
+3 -3
View File
@@ -113,11 +113,11 @@ public class BusinessDocumentDetaliPO extends BaseVOEntity{
private Integer payStatusShipper;
@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;
@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;
@@ -126,4 +126,4 @@ public class BusinessDocumentDetaliPO extends BaseVOEntity{
@ApiModelProperty("油卡号")
private String fuelCardNumber;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java
+3 -3
View File
@@ -80,12 +80,12 @@ public class Reconciliation 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;
@@ -169,7 +169,7 @@ public class Reconciliation 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;
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java
+3 -3
View File
@@ -86,12 +86,12 @@ public class ReconciliationPO 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;
@@ -177,7 +177,7 @@ public class ReconciliationPO 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;
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java
+9 -9
View File
@@ -98,12 +98,12 @@ public class ReconciliationDO 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;
@@ -199,7 +199,7 @@ public class ReconciliationDO 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;
@@ -215,27 +215,27 @@ public class ReconciliationDO 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_finance/src/main/java/com/linke/finance/domain/withdrawApplication/entity/WithdrawApplication.java
+4 -4
View File
@@ -47,7 +47,7 @@ public class WithdrawApplication extends BaseVOEntity{
private String applicantLicenseNumber;
@ApiModelProperty("申请时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyTime;
@@ -84,7 +84,7 @@ public class WithdrawApplication extends BaseVOEntity{
private String bindingPhone;
@ApiModelProperty("转账时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date transferTime;
@@ -97,7 +97,7 @@ public class WithdrawApplication 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 arriveAccountTime;
@@ -150,4 +150,4 @@ public class WithdrawApplication extends BaseVOEntity{
private String organizationName;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/po/WithdrawApplicationPO.java
+4 -4
View File
@@ -46,7 +46,7 @@ public class WithdrawApplicationPO extends BaseVOEntity{
private String applicantLicenseNumber;
@ApiModelProperty("申请时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyTime;
@@ -83,7 +83,7 @@ public class WithdrawApplicationPO extends BaseVOEntity{
private String bindingPhone;
@ApiModelProperty("转账时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date transferTime;
@@ -96,7 +96,7 @@ public class WithdrawApplicationPO 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 arriveAccountTime;
@@ -150,4 +150,4 @@ public class WithdrawApplicationPO extends BaseVOEntity{
}
}

Some files were not shown because too many files have changed in this diff Show More