Merge branch 'pollex-dev' into sit

wayne

2022-02-17 4394e4248455637ab7836756058ac872fdf4af10

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

@@ -36,14 +36,16 @@
        ConsultantDTO consultantDTO = new ConsultantDTO();
        consultantDTO.setAgentNo(source.getAgentNo());
        consultantDTO.setName(source.getName());
        consultantDTO.setRole(source.getRole());
        consultantDTO.setAvgScore(source.getAvgScore());
        consultantDTO.setServeArea(splitStringWithChar(source.getServeArea()));
        consultantDTO.setSeniority_year(source.getSeniorityYear());
        consultantDTO.setSeniority_month(source.getSeniorityMonth());
        consultantDTO.setSeniority(source.getSeniorityDTOString());
        consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
        consultantDTO.setGender(source.getGender());
        consultantDTO.setCommunicationStyle(source.getCommunicationStyle());
        consultantDTO.setImg(source.getPhotoPath());
        consultantDTO.setRole(source.getRole());

        consultantDTO.setSuitability(0);
        consultantDTO.setContactStatus(null);
        consultantDTO.setUpdateTime(null);
//        consultantDTO.setLatestAppointmentId(null);

        return consultantDTO;
    }
@@ -57,11 +59,12 @@
        consultantDetailDTO.setAvgScore(source.getAvgScore());
        consultantDetailDTO.setTitle(source.getTitle());
        consultantDetailDTO.setPhoneNumber(source.getPhoneNumber());
        consultantDetailDTO.setServeArea(splitStringWithChar(source.getServeArea()));
        consultantDetailDTO.setServeArea(source.getServeArea());
        consultantDetailDTO.setCompanyAddress(source.getCompanyAddress());
        consultantDetailDTO.setSeniority(source.getSeniorityDTOString());
        consultantDetailDTO.setConcept(source.getConcept());
        consultantDetailDTO.setAwards(source.getAward());
        consultantDetailDTO.setImg(source.getPhotoPath());
        consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
        consultantDetailDTO.setExperiences(source.getExperience());