Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend…

Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend into dev_20201208_hiring

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -54,6 +54,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             // 数据库实体
             // 数据库实体
             AclPractitionerHiringMembership membership = new AclPractitionerHiringMembership();
             AclPractitionerHiringMembership membership = new AclPractitionerHiringMembership();
             BeanUtils.copyProperties(requestVO, membership);
             BeanUtils.copyProperties(requestVO, membership);
+            membership.setHiringBasicInfoId(basicInfo.getId());
             membership.setIsActive(1);
             membership.setIsActive(1);
 
 
             Date curDate = new Date();
             Date curDate = new Date();

yd-api/src/main/java/com/yd/api/practitioner/vo/recruit/PractitionerPotentialInfo.java

@@ -24,6 +24,7 @@ public class PractitionerPotentialInfo {
     private String createdAt;
     private String createdAt;
     private Date updateAt;
     private Date updateAt;
     private String timeToOnboarding;
     private String timeToOnboarding;
+    private Long hiringBasicInfoId;
 
 
     public Long getPotentialId() {
     public Long getPotentialId() {
         return potentialId;
         return potentialId;
@@ -192,4 +193,12 @@ public class PractitionerPotentialInfo {
     public void setUpdateAt(Date updateAt) {
     public void setUpdateAt(Date updateAt) {
         this.updateAt = updateAt;
         this.updateAt = updateAt;
     }
     }
+
+    public Long getHiringBasicInfoId() {
+        return hiringBasicInfoId;
+    }
+
+    public void setHiringBasicInfoId(Long hiringBasicInfoId) {
+        this.hiringBasicInfoId = hiringBasicInfoId;
+    }
 }
 }

yd-api/src/main/resources/mapper/customer/AclPractitionerPotentialMapper.xml

@@ -311,10 +311,12 @@
         t.track_status_id trackStatusId,
         t.track_status_id trackStatusId,
         t.id trackId,
         t.id trackId,
         t.created_at updateAt,
         t.created_at updateAt,
-        date_format(p.created_at,'%Y-%m-%d') createdAt
+        date_format(p.created_at,'%Y-%m-%d') createdAt,
+        h.id hiringBasicInfoId
       FROM
       FROM
         ag_acl_practitioner_potential p
         ag_acl_practitioner_potential p
           INNER JOIN ag_acl_practitioner_potential_assigned_track t ON p.id = t.practitioner_potential_id
           INNER JOIN ag_acl_practitioner_potential_assigned_track t ON p.id = t.practitioner_potential_id
+          LEFT JOIN ag_acl_practitioner_hiring_basic_info h ON p.id = h.practitioner_potential_id
       WHERE
       WHERE
         t.practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
         t.practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
       order by p.id desc;
       order by p.id desc;