Commit 9da5f719 by zhangxingmin

push

parent e807b750
package com.yd.csf.feign.dto.appointment; package com.yd.csf.feign.dto.appointment;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -70,10 +71,12 @@ public class ApiAppointmentReferrerLogDto { ...@@ -70,10 +71,12 @@ public class ApiAppointmentReferrerLogDto {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
package com.yd.csf.feign.dto.appointment; package com.yd.csf.feign.dto.appointment;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -85,10 +86,12 @@ public class ApiAppointmentUserSignLogDto { ...@@ -85,10 +86,12 @@ public class ApiAppointmentUserSignLogDto {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
package com.yd.csf.feign.response.appointment; package com.yd.csf.feign.response.appointment;
import com.yd.csf.feign.dto.appointment.ApiAppointmentReferrerDto; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yd.csf.feign.dto.appointment.ApiAppointmentReferrerLogDto; import com.yd.csf.feign.dto.appointment.ApiAppointmentReferrerLogDto;
import com.yd.csf.feign.dto.appointment.ApiAppointmentUserSignDto;
import com.yd.csf.feign.dto.appointment.ApiAppointmentUserSignLogDto; import com.yd.csf.feign.dto.appointment.ApiAppointmentUserSignLogDto;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data
public class ApiAppointmentLogDetailResponse { public class ApiAppointmentLogDetailResponse {
/**
* 预约信息日志表主键ID
*/
private Long id; private Long id;
/** /**
...@@ -63,6 +58,21 @@ public class ApiAppointmentLogDetailResponse { ...@@ -63,6 +58,21 @@ public class ApiAppointmentLogDetailResponse {
private String proposalNo; private String proposalNo;
/** /**
* 是否有其他预约同时进行: 0-否, 1-是(字典)
*/
private Integer isTogether;
/**
* 进行同时预约的分组编号
*/
private String togetherGroupNo;
/**
* 进行同时预约的预约编号
*/
private String togetherAppointmentNo;
/**
* 预约状态: 0-暂存 1-待预约, 2-待签署 3-已签署 4-已取消(字典) * 预约状态: 0-暂存 1-待预约, 2-待签署 3-已签署 4-已取消(字典)
*/ */
private Integer status; private Integer status;
...@@ -73,13 +83,82 @@ public class ApiAppointmentLogDetailResponse { ...@@ -73,13 +83,82 @@ public class ApiAppointmentLogDetailResponse {
private String applyType; private String applyType;
/** /**
* 业务编号
*/
private String businessNo;
/**
* 意向预约时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime intentionAppointmentTime;
/**
* 确定预约时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime confirmAppointmentTime;
/**
* 顾问是否陪同: 0-否, 1-是(字典)
*/
private Integer isAccompany;
/**
* 陪同顾问姓名(FNA Form有填写,可带入)
*/
private String accompanyName;
/**
* 陪同顾问手机区号
*/
private String accompanyMobileCode;
/**
* 陪同顾问手机
*/
private String accompanyMobile;
/**
* 陪同顾问邮箱
*/
private String accompanyEmail;
/**
* 业务代表1账号
*/
private String businessRepresentAccount1;
/**
* 业务代表1姓名
*/
private String businessRepresentName1;
/**
* 业务代表1电话号码区号
*/
private String businessRepresentMobile1Code;
/**
* 业务代表1电话号码
*/
private String businessRepresentMobile1;
/**
* 业务代表1邮箱
*/
private String businessRepresentEmail1;
/**
* 到港时间 * 到港时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime arrivalTime; private LocalDateTime arrivalTime;
/** /**
* 离港时间 * 离港时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime departureTime; private LocalDateTime departureTime;
/** /**
...@@ -120,11 +199,13 @@ public class ApiAppointmentLogDetailResponse { ...@@ -120,11 +199,13 @@ public class ApiAppointmentLogDetailResponse {
/** /**
* 开户时间段(开始) * 开户时间段(开始)
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime openAccountStartTime; private LocalDateTime openAccountStartTime;
/** /**
* 开户时间段(结束) * 开户时间段(结束)
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime openAccountEndTime; private LocalDateTime openAccountEndTime;
/** /**
...@@ -185,14 +266,47 @@ public class ApiAppointmentLogDetailResponse { ...@@ -185,14 +266,47 @@ public class ApiAppointmentLogDetailResponse {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
* 签单日
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signDate;
/**
* 开户行ID
*/
private String bankId;
/**
* 开户所需资料
*/
private String materials;
/**
* 是否法定受益人
*/
private Integer isLegalBeneficiary;
/**
* 转介人是否陪同
*/
private Integer isReferrerAccompany;
/**
* 是否有第二持有人
*/
private Integer isSecond;
/**
* 预约-转介人信息日志列表 * 预约-转介人信息日志列表
*/ */
private List<ApiAppointmentReferrerLogDto> referrerDtoList; private List<ApiAppointmentReferrerLogDto> referrerDtoList;
......
...@@ -332,4 +332,40 @@ public class AppointmentLog implements Serializable { ...@@ -332,4 +332,40 @@ public class AppointmentLog implements Serializable {
*/ */
@TableField("update_time") @TableField("update_time")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/**
* 签单日
*/
@TableField("sign_date")
private LocalDateTime signDate;
/**
* 开户行ID
*/
@TableField("bank_id")
private String bankId;
/**
* 开户所需资料
*/
@TableField("materials")
private String materials;
/**
* 是否法定受益人
*/
@TableField("is_legal_beneficiary")
private Integer isLegalBeneficiary;
/**
* 转介人是否陪同
*/
@TableField("is_referrer_accompany")
private Integer isReferrerAccompany;
/**
* 是否有第二持有人
*/
@TableField("is_second")
private Integer isSecond;
} }
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