Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -6,11 +6,8 @@ import com.yd.api.agms.vo.hiring.*;
 import com.yd.api.result.CommonResult;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.customer.*;
 import com.yd.dal.entity.customer.*;
-import com.yd.dal.entity.meta.MdCode;
 import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
-import com.yd.dal.entity.order.PoOrder;
-import com.yd.dal.entity.practitioner.ScheduleTrack;
 import com.yd.dal.entity.practitioner.hiring.HiringApproveRecords;
 import com.yd.dal.entity.practitioner.hiring.HiringApproveRecords;
 import com.yd.dal.entity.user.AclUser;
 import com.yd.dal.entity.user.AclUser;
 import com.yd.dal.mapper.customer.AclPractitionerHiringBasicInfoMapper;
 import com.yd.dal.mapper.customer.AclPractitionerHiringBasicInfoMapper;
@@ -34,7 +31,10 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * @author xxy
  * @author xxy
@@ -480,11 +480,17 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         practitioner.setProvinceName(basicInfo.getProvinceName());
         practitioner.setProvinceName(basicInfo.getProvinceName());
         practitioner.setCityId(basicInfo.getCityId());
         practitioner.setCityId(basicInfo.getCityId());
         practitioner.setCityName(basicInfo.getCityName());
         practitioner.setCityName(basicInfo.getCityName());
+        if (StringUtils.isNotBlank(basicInfo.getResidentAddress())) {
+            practitioner.setDetailAddress(basicInfo.getResidentAddress());
+        } else {
+            practitioner.setDetailAddress(basicInfo.getProvinceName() + basicInfo.getCityName());
+        }
         practitioner.setWechatId(basicInfo.getWechatId());
         practitioner.setWechatId(basicInfo.getWechatId());
         practitioner.setIsProfileShow(0);
         practitioner.setIsProfileShow(0);
         practitioner.setIsNameShow(0);
         practitioner.setIsNameShow(0);
         practitioner.setIsMobileShow(0);
         practitioner.setIsMobileShow(0);
         practitioner.setEducationLevel(basicInfo.getLastGraduateCode());
         practitioner.setEducationLevel(basicInfo.getLastGraduateCode());
+        practitioner.setGraduatedUniversity(basicInfo.getLastGraduateSchool());
         practitioner.setMentorId(membership.getMentorPractitionerId());
         practitioner.setMentorId(membership.getMentorPractitionerId());
         practitioner.setIntroducerId(membership.getIntroducerPractitionerId());
         practitioner.setIntroducerId(membership.getIntroducerPractitionerId());
         practitioner.setGender(basicInfo.getGender());
         practitioner.setGender(basicInfo.getGender());

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitioner.java

 package com.yd.dal.entity.customer;
 package com.yd.dal.entity.customer;
 
 
-import java.util.Date;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 /**
 /**
  * 从业人员执业证信息表
  * 从业人员执业证信息表
  */
  */
@@ -230,4 +231,9 @@ public class AclPractitioner {
      * 能够查看薪资表
      * 能够查看薪资表
      */
      */
     private Long canSeeSalaryList;
     private Long canSeeSalaryList;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
 }
 }
\ No newline at end of file