Commit 19d1a237 authored by mengmeng's avatar mengmeng

修改appoinment_time 字段类型

parent 155ab080
...@@ -42,9 +42,11 @@ public class AppointmentOrderDTO implements Serializable { ...@@ -42,9 +42,11 @@ public class AppointmentOrderDTO implements Serializable {
@ApiModelProperty(value = "预约所属的服务事项名称") @ApiModelProperty(value = "预约所属的服务事项名称")
private String serviceName; private String serviceName;
@ApiModelProperty(value = "是否浙里办预约 0否,1是") @ApiModelProperty(value = "是否浙里办预约 0否,1是")
private Integer isApp; private Integer isApp;
@ApiModelProperty(value = "预约订单所在队列id") @ApiModelProperty(value = "预约订单所在队列id")
private Long orderQueueId; private Long orderQueueId;
...@@ -58,13 +60,14 @@ public class AppointmentOrderDTO implements Serializable { ...@@ -58,13 +60,14 @@ public class AppointmentOrderDTO implements Serializable {
private String appointmentIdCard; private String appointmentIdCard;
@ApiModelProperty(value = "预约时间") @ApiModelProperty(value = "预约时间")
private Date appointmentTime; private String appointmentTime;
@ApiModelProperty(value = "服务办事窗口") @ApiModelProperty(value = "服务办事窗口")
private String serviceWindow; private String serviceWindow;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
/*
@ApiModelProperty(value = "部门ID") @ApiModelProperty(value = "部门ID")
private Long deptId; private Long deptId;
...@@ -78,16 +81,17 @@ public class AppointmentOrderDTO implements Serializable { ...@@ -78,16 +81,17 @@ public class AppointmentOrderDTO implements Serializable {
@ApiModelProperty(value = "订单发起人联系电话") @ApiModelProperty(value = "订单发起人联系电话")
private String creatorTel; private String creatorTel;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "更新者") @ApiModelProperty(value = "更新者")
private Long updater; private Long updater;
*/
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private Date updateDate; private Date updateDate;
public AppointmentOrderDTO assembleAppointmentOrderDTO(ReservationDTO reservationDTO){ @ApiModelProperty(value = "创建时间")
private Date createDate;
public AppointmentOrderDTO assembleAppointmentOrderDTO(ReservationDTO reservationDTO){
AppointmentOrderDTO dto = new AppointmentOrderDTO(); AppointmentOrderDTO dto = new AppointmentOrderDTO();
Date dt = new Date(); Date dt = new Date();
......
...@@ -44,7 +44,7 @@ public class ReservationDTO implements Serializable { ...@@ -44,7 +44,7 @@ public class ReservationDTO implements Serializable {
private String appointmentIdCard; private String appointmentIdCard;
@ApiModelProperty(value = "预约时间") @ApiModelProperty(value = "预约时间")
private Date appointmentTime; private String appointmentTime;
@ApiModelProperty(value = "服务办事窗口") @ApiModelProperty(value = "服务办事窗口")
private String serviceWindow; private String serviceWindow;
......
...@@ -66,7 +66,7 @@ public class AppointmentOrderEntity extends BaseEntity { ...@@ -66,7 +66,7 @@ public class AppointmentOrderEntity extends BaseEntity {
/** /**
* 预约时间 * 预约时间
*/ */
private Date appointmentTime; private String appointmentTime;
/** /**
* 服务办事窗口 * 服务办事窗口
*/ */
...@@ -95,4 +95,4 @@ public class AppointmentOrderEntity extends BaseEntity { ...@@ -95,4 +95,4 @@ public class AppointmentOrderEntity extends BaseEntity {
* 更新时间 * 更新时间
*/ */
private Date updateDate; private Date updateDate;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment