Merge branch 'sit' into uat

wayne

2022-02-17 a3716f72066d25d745f4d5103ff23a553c3e102b

 pamapi/src/main/java/com/pollex/pam/service/dto/CustomerFavoriteConsultantDTO.java

@@ -9,8 +9,6 @@

public class CustomerFavoriteConsultantDTO {

    @JsonProperty("new")
    private boolean newConsultant;
    private String agentNo;
    private String name;
    private String img;
@@ -19,20 +17,10 @@
    private ContactStatusEnum contactStatus;
    private Instant createTime;
    private Instant updateTime;
    private Instant customerViewTime;
    private String role;
    private String seniority;
    private Long latestAppointmentId;
    private Instant latestAppointmentDate;
    private Float latestAppointmentScore;
    private List<AppointmentCustomerViewDTO> appointments;

    public boolean isNewConsultant() {
        if(createTime != null){
            Instant nowTimestamp = Instant.now();
            return ChronoUnit.DAYS.between(createTime, nowTimestamp) < 3;
        }
        return false;
    }

    public String getAgentNo() {
        return agentNo;
@@ -66,14 +54,6 @@
        this.expertise = expertise;
    }

    public Float getLatestAppointmentScore() {
        return latestAppointmentScore;
    }

    public void setLatestAppointmentScore(Float latestAppointmentScore) {
        this.latestAppointmentScore = latestAppointmentScore;
    }

    public Float getAvgScore() {
        return avgScore;
    }
@@ -88,14 +68,6 @@

    public void setContactStatus(ContactStatusEnum contactStatus) {
        this.contactStatus = contactStatus;
    }

    public Instant getLatestAppointmentDate() {
        return latestAppointmentDate;
    }

    public void setLatestAppointmentDate(Instant latestAppointmentDate) {
        this.latestAppointmentDate = latestAppointmentDate;
    }

    public Instant getCreateTime() {
@@ -114,6 +86,14 @@
        this.updateTime = updateTime;
    }

    public Instant getCustomerViewTime() {
        return customerViewTime;
    }

    public void setCustomerViewTime(Instant customerViewTime) {
        this.customerViewTime = customerViewTime;
    }

    public String getRole() {
        return role;
    }
@@ -128,18 +108,6 @@

    public void setSeniority(String seniority) {
        this.seniority = seniority;
    }

    public void setNewConsultant(boolean newConsultant) {
        this.newConsultant = newConsultant;
    }

    public Long getLatestAppointmentId() {
        return latestAppointmentId;
    }

    public void setLatestAppointmentId(Long latestAppointmentId) {
        this.latestAppointmentId = latestAppointmentId;
    }

    public List<AppointmentCustomerViewDTO> getAppointments() {