Merge branch 'master' of ssh://dev.pollex.com.tw:29418/pcalife/PAM

劉鈞霖

2021-11-15 f4ff5a6a7156417f23302ca86896a85d2937ce6a

 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java

@@ -2,7 +2,7 @@

import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomFavoriteConsultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.dto.ConsultantDTO;
@@ -40,11 +40,11 @@
        return consultantDTO;
    }

    public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) {
        Consultant consultant = customFavoriteConsultant.getConsultant();
    public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
        Consultant consultant = customerFavoriteConsultant.getConsultant();
        ConsultantDTO dto = toDto(consultant);

        final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customFavoriteConsultant.getCustomerId())
        final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
            .stream()
            .max(Comparator.comparing(Appointment::getAppointmentDate));

@@ -57,7 +57,7 @@
        else {
            dto.setContactStatus(ContactStatusEnum.PICKED);
            dto.setLatestAppointmentId(null);
            dto.setUpdateTime(customFavoriteConsultant.getLastModifiedDate());
            dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
        }

        return dto;