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

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

 package com.yd.api.practitioner.vo.recruit;
 
 public class AddRecruitTrackRequestVO {
-    private Long trackId;
+    private Long practitionerId;
+    private Long potentialId;
     private Long trackStatusId;
     private String notice;
+    private String trackTime;
     private Integer isActive;
 
-    public Long getTrackId() {
-        return trackId;
-    }
-
-    public void setTrackId(Long trackId) {
-        this.trackId = trackId;
-    }
 
     public Long getTrackStatusId() {
         return trackStatusId;
@@ -37,4 +32,28 @@ public class AddRecruitTrackRequestVO {
     public void setIsActive(Integer isActive) {
         this.isActive = isActive;
     }
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
+
+    public Long getPotentialId() {
+        return potentialId;
+    }
+
+    public void setPotentialId(Long potentialId) {
+        this.potentialId = potentialId;
+    }
+
+    public String getTrackTime() {
+        return trackTime;
+    }
+
+    public void setTrackTime(String trackTime) {
+        this.trackTime = trackTime;
+    }
 }

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

@@ -16,13 +16,9 @@ public class PractitionerPotentialInfo {
     private String tag;
     private String remark;
     private String ossPathResume;
-    private String assignedId;
-    private String assignedName;
     private Long trackStatusId;
     private String trackStatus;
     private Long trackId;
-    private Long operateUserId;
-    private String operateUserName;
     private String createdAt;
 
     public Long getPotentialId() {
@@ -145,22 +141,6 @@ public class PractitionerPotentialInfo {
         this.ossPathResume = ossPathResume;
     }
 
-    public String getAssignedId() {
-        return assignedId;
-    }
-
-    public void setAssignedId(String assignedId) {
-        this.assignedId = assignedId;
-    }
-
-    public String getAssignedName() {
-        return assignedName;
-    }
-
-    public void setAssignedName(String assignedName) {
-        this.assignedName = assignedName;
-    }
-
     public Long getTrackStatusId() {
         return trackStatusId;
     }
@@ -185,22 +165,6 @@ public class PractitionerPotentialInfo {
         this.trackId = trackId;
     }
 
-    public Long getOperateUserId() {
-        return operateUserId;
-    }
-
-    public void setOperateUserId(Long operateUserId) {
-        this.operateUserId = operateUserId;
-    }
-
-    public String getOperateUserName() {
-        return operateUserName;
-    }
-
-    public void setOperateUserName(String operateUserName) {
-        this.operateUserName = operateUserName;
-    }
-
     public String getCreatedAt() {
         return createdAt;
     }

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

 package com.yd.api.practitioner.vo.recruit;
 
 public class RecruitListRequestVO {
-    private Long assignedId;
+    private Long practitionerId;
     private Integer status;//1-待跟进，2-跟进中，3-以完成
 
-    public Long getAssignedId() {
-        return assignedId;
+    public Long getPractitionerId() {
+        return practitionerId;
     }
 
-    public void setAssignedId(Long assignedId) {
-        this.assignedId = assignedId;
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
     }
 
     public Integer getStatus() {

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

+package com.yd.api.practitioner.vo.recruit;
+
+public class RecruitTrackInfo {
+    private Long trackId;
+    private Long trackStatusId;
+    private String trackStatus;
+    private String notice;
+    private String trackTime;
+    private String createAt;
+    private Long operateUserId;
+    private String operateUserName;
+
+    public Long getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(Long trackId) {
+        this.trackId = trackId;
+    }
+
+    public Long getTrackStatusId() {
+        return trackStatusId;
+    }
+
+    public void setTrackStatusId(Long trackStatusId) {
+        this.trackStatusId = trackStatusId;
+    }
+
+    public String getTrackStatus() {
+        return trackStatus;
+    }
+
+    public void setTrackStatus(String trackStatus) {
+        this.trackStatus = trackStatus;
+    }
+
+    public String getNotice() {
+        return notice;
+    }
+
+    public void setNotice(String notice) {
+        this.notice = notice;
+    }
+
+    public String getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(String createAt) {
+        this.createAt = createAt;
+    }
+
+    public Long getOperateUserId() {
+        return operateUserId;
+    }
+
+    public void setOperateUserId(Long operateUserId) {
+        this.operateUserId = operateUserId;
+    }
+
+    public String getOperateUserName() {
+        return operateUserName;
+    }
+
+    public void setOperateUserName(String operateUserName) {
+        this.operateUserName = operateUserName;
+    }
+
+    public String getTrackTime() {
+        return trackTime;
+    }
+
+    public void setTrackTime(String trackTime) {
+        this.trackTime = trackTime;
+    }
+}

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

@@ -2,7 +2,7 @@ package com.yd.api.practitioner.vo.recruit;
 
 public class RecruitTrackQueryRequestVO {
     private Long potentialId;
-    private Long assignedId;
+    private Long practitionerId;
 
     public Long getPotentialId() {
         return potentialId;
@@ -12,11 +12,11 @@ public class RecruitTrackQueryRequestVO {
         this.potentialId = potentialId;
     }
 
-    public Long getAssignedId() {
-        return assignedId;
+    public Long getPractitionerId() {
+        return practitionerId;
     }
 
-    public void setAssignedId(Long assignedId) {
-        this.assignedId = assignedId;
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
     }
 }

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

 package com.yd.api.practitioner.vo.recruit;
 
-public class RecruitTrackQueryResponseVO {
-    private Long trackId;
-    private Long trackStatusId;
-    private String trackStatus;
-    private String notice;
-    private String createAt;
-    private Long operateUserId;
-    private String operateUserName;
-
-    public Long getTrackId() {
-        return trackId;
-    }
-
-    public void setTrackId(Long trackId) {
-        this.trackId = trackId;
-    }
-
-    public Long getTrackStatusId() {
-        return trackStatusId;
-    }
-
-    public void setTrackStatusId(Long trackStatusId) {
-        this.trackStatusId = trackStatusId;
-    }
-
-    public String getTrackStatus() {
-        return trackStatus;
-    }
-
-    public void setTrackStatus(String trackStatus) {
-        this.trackStatus = trackStatus;
-    }
-
-    public String getNotice() {
-        return notice;
-    }
+import com.yd.api.result.CommonResult;
 
-    public void setNotice(String notice) {
-        this.notice = notice;
-    }
-
-    public String getCreateAt() {
-        return createAt;
-    }
+import java.util.List;
 
-    public void setCreateAt(String createAt) {
-        this.createAt = createAt;
-    }
+public class RecruitTrackQueryResponseVO {
+    private List<RecruitTrackInfo> recruitTrackInfoList;
+    private CommonResult commonResult;
 
-    public Long getOperateUserId() {
-        return operateUserId;
+    public List<RecruitTrackInfo> getRecruitTrackInfoList() {
+        return recruitTrackInfoList;
     }
 
-    public void setOperateUserId(Long operateUserId) {
-        this.operateUserId = operateUserId;
+    public void setRecruitTrackInfoList(List<RecruitTrackInfo> recruitTrackInfoList) {
+        this.recruitTrackInfoList = recruitTrackInfoList;
     }
 
-    public String getOperateUserName() {
-        return operateUserName;
+    public CommonResult getCommonResult() {
+        return commonResult;
     }
 
-    public void setOperateUserName(String operateUserName) {
-        this.operateUserName = operateUserName;
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
     }
 }

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

@@ -114,7 +114,7 @@ public class AclPractitionerPotential implements Serializable {
 
     private Integer creatorType;
 
-    private Integer updatorType;
+    private Integer updaterType;
 
     private Long customerId;
 }
\ No newline at end of file

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

@@ -62,9 +62,13 @@ public class AclPractitionerPotentialAssignedTrack implements Serializable {
 
     private Integer creatorType;
 
-    private Integer updatorType;
+    private Integer updaterType;
 
     private Integer isLasted;
 
+    private Integer trackScore;
+
+    private Date trackTime;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

+package com.yd.dal.entity.customer;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_acl_practitioner_potential_assigneds
+ * @author 
+ */
+@Data
+public class AclPractitionerPotentialAssigneds implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 经纪人id
+     */
+    private Long assignedPractitionerId;
+
+    /**
+     * FK ag_acl_practitioner_potential.id潜在经纪人表id
+     */
+    private Long practitionerPotentialId;
+
+    /**
+     * 预计报聘时间
+     */
+    private Date timeToOnboarding;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 分析建置时间
+     */
+    private Date createdAt;
+
+    /**
+     * 建置者 FK ag_acl_user.id
+     */
+    private Long createdBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedAt;
+
+    /**
+     * 更新者 FK ag_acl_user.id
+     */
+    private Long updatedBy;
+
+    /**
+     * 更新者类型:1为user id（AGMS），2为本人practitioner id（银盾经纪）
+     */
+    private Integer updaterType;
+
+    /**
+     * 创建者类型:1为user id（AGMS），2为本人practitioner id（银盾经纪）
+     */
+    private Integer creatorType;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.yd.dal.entity.customer;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_acl_user
+ * @author 
+ */
+@Data
+public class AclUser implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 1= Staff  2.Customer  3.Partner
+     */
+    private Integer userRole;
+
+    /**
+     * 员工编号
+     */
+    private String employeeNo;
+
+    /**
+     * 1= 安吉保 2=银盾
+     */
+    private Integer company;
+
+    /**
+     * FK ag_system_dept.id
+     */
+    private Long deptId;
+
+    /**
+     * FK ag_system_role.id
+     */
+    private Long roleId;
+
+    /**
+     * login ID
+     */
+    private String login;
+
+    /**
+     * 88888888
+     */
+    private String password;
+
+    /**
+     * user name
+     */
+    private String name;
+
+    /**
+     * user nickname
+     */
+    private String nickname;
+
+    private String mobileNo;
+
+    private String idNo;
+
+    /**
+     * 最后登入时间
+     */
+    private Date lastLoginTime;
+
+    /**
+     * 最后登出时间
+     */
+    private Date logoutTime;
+
+    /**
+     * 1=PC 2=Mobile 3=Pad
+     */
+    private Integer loginSource;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 员工email
+     */
+    private String email;
+
+    /**
+     * 创建日期
+     */
+    private Date createdAt;
+
+    /**
+     * creator
+     */
+    private Long createdBy;
+
+    /**
+     * 0000-00-00 00:00:00
+     */
+    private Date updatedAt;
+
+    /**
+     * updator, FK ag_acl_user.id
+     */
+    private Long updatedBy;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/meta/MdDropMaster.java

+package com.yd.dal.entity.meta;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_md_drop_master
+ * @author 
+ */
+@Data
+public class MdDropMaster implements Serializable {
+    /**
+     * 下拉选框编号
+     */
+    private Long id;
+
+    /**
+     * 下拉选框场景编码
+     */
+    private String scenarioCode;
+
+    /**
+     * 下拉选框场景名称：产品维护中文件上传哪里的文件类型
+     */
+    private String scenarioName;
+
+    /**
+     * 下拉选框代码
+     */
+    private String dropCode;
+
+    /**
+     * 下拉选框名称
+     */
+    private String dropName;
+
+    /**
+     * 下拉选框说明
+     */
+    private String dropCodeDesc;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    private Date createdAt;
+
+    private Long createdBy;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/meta/MdDropOptions.java

@@ -3,9 +3,6 @@ package com.yd.dal.entity.meta;
 import java.util.Date;
 import lombok.Data;
 
-/**
-    * 下拉选框选项资料
-    */
 @Data
 public class MdDropOptions {
     /**
@@ -46,9 +43,12 @@ public class MdDropOptions {
     /**
     * 0=No, 1=Yes
     */
+
     private Integer isActive;
 
     private Date createdAt;
 
     private Long createdBy;
+
+    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java

@@ -37,4 +37,6 @@ public interface AclPractitionerMapper {
     AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive")int isActive);
 
     List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId")Long practitionerId);
+
+    List<AclPractitioner> findByIds(@Param("practitionerIdList") List<Long> practitionerIdList);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.java

@@ -2,6 +2,8 @@ package com.yd.dal.mapper.customer;
 
 import com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 import java.util.List;
 
 public interface AclPractitionerPotentialAssignedTrackMapper {
@@ -18,4 +20,12 @@ public interface AclPractitionerPotentialAssignedTrackMapper {
     int updateByPrimaryKey(AclPractitionerPotentialAssignedTrack record);
 
     void insertList(@Param("potentialAssignedTrackList") List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(@Param("practitionerId") Long practitionerId, @Param("potentialId")Long potentialId, @Param("trackStatusId")Long trackStatusId, @Param("trackDate")Date trackDate);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPotentialIdAndIsLasted(@Param("potentialId")Long potentialId, @Param("isLasted")int isLasted);
+
+    void updateAll(@Param("assignedTrackUpdateList")List<AclPractitionerPotentialAssignedTrack> assignedTrackUpdateList);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(@Param("practitionerId")Long practitionerId, @Param("potentialId")Long potentialId);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialAssignedsMapper.java

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AclPractitionerPotentialAssignedsMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AclPractitionerPotentialAssigneds record);
+
+    int insertSelective(AclPractitionerPotentialAssigneds record);
+
+    AclPractitionerPotentialAssigneds selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AclPractitionerPotentialAssigneds record);
+
+    int updateByPrimaryKey(AclPractitionerPotentialAssigneds record);
+
+    void insertList(@Param("potentialAssignedsList") List<AclPractitionerPotentialAssigneds> potentialAssignedsList);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialMapper.java

 package com.yd.dal.mapper.customer;
 
+import com.yd.api.practitioner.vo.recruit.PractitionerPotentialInfo;
 import com.yd.dal.entity.customer.AclPractitionerPotential;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,6 @@ public interface AclPractitionerPotentialMapper {
     int updateByPrimaryKey(AclPractitionerPotential record);
 
     List<AclPractitionerPotential> findByMobileNo(@Param("mobileNo") String mobileNo, @Param("isActive") Integer isActive);
+
+    List<PractitionerPotentialInfo> findByPractitionerIdAndLasted(@Param("practitionerId")Long practitionerId);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclUserMapper.java

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AclUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AclUserMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AclUser record);
+
+    int insertSelective(AclUser record);
+
+    AclUser selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AclUser record);
+
+    int updateByPrimaryKey(AclUser record);
+
+    List<AclUser> findByIds(@Param("userIdList") List<Long> userIdList);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/meta/MdDropMasterMapper.java

+package com.yd.dal.mapper.meta;
+
+import com.yd.dal.entity.meta.MdDropMaster;
+
+public interface MdDropMasterMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MdDropMaster record);
+
+    int insertSelective(MdDropMaster record);
+
+    MdDropMaster selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MdDropMaster record);
+
+    int updateByPrimaryKey(MdDropMaster record);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/meta/MdDropOptionsMapper.java

 package com.yd.dal.mapper.meta;
 
 import com.yd.dal.entity.meta.MdDropOptions;
-
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface MdDropOptionsMapper {
@@ -20,4 +20,8 @@ public interface MdDropOptionsMapper {
     List<MdDropOptions> selectByObj(MdDropOptions info);
 
     List<MdDropOptions> findByDropMasterCode(String dropMasterCode);
+
+    List<MdDropOptions> findByMasterCode(@Param("masterCode")String masterCode);
+
+    List<MdDropOptions> findByMasterCodeAndOrderId(@Param("masterCode")String masterCode, @Param("orderId")int orderId);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java

@@ -75,4 +75,11 @@ public interface AclPractitionerDALService {
      */
     List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId);
     void updatePractitioner(AclPractitioner practitioner);
+
+    /**
+     * 通过id数组查询
+     * @param practitionerIdList
+     * @return
+     */
+    List<AclPractitioner> findByIds(List<Long> practitionerIdList);
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialAssignedTrackDALService.java

@@ -3,10 +3,21 @@ package com.yd.dal.service.customer;
 import com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Service("aclPractitionerPotentialAssignedTrackDALService")
 public interface AclPractitionerPotentialAssignedTrackDALService {
 
     void saveAll(List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(Long practitionerId, Long potentialId, Long trackStatusId, Date trackDate);
+
+    void save(AclPractitionerPotentialAssignedTrack assignedTrack);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPotentialIdAndIsLasted(Long potentialId, int isLasted);
+
+    void updateAll(List<AclPractitionerPotentialAssignedTrack> assignedTrackUpdateList);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId);
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialAssignedsDALService.java

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("aclPractitionerPotentialAssignedsDALService")
+public interface AclPractitionerPotentialAssignedsDALService {
+
+    void saveAll(List<AclPractitionerPotentialAssigneds> potentialAssignedsList);
+}

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialDALService.java

 package com.yd.dal.service.customer;
 
+import com.yd.api.practitioner.vo.recruit.PractitionerPotentialInfo;
 import com.yd.dal.entity.customer.AclPractitionerPotential;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +16,20 @@ public interface AclPractitionerPotentialDALService {
     List<AclPractitionerPotential> findByMobileNo(String mobileNo,Integer isActive);
 
     /**
+     * 更新
+     * @param practitionerPotential
+     * @return
+     */
+    int update(AclPractitionerPotential practitionerPotential);
+
+    /**
+     * 查询该团队长对于每个增员最新的记录
+     * @param practitionerId
+     * @return
+     */
+    List<PractitionerPotentialInfo> findByPractitionerIdAndLasted(Long practitionerId);
+
+    /**
      * 保存
      * @param practitionerPotential
      * @return

yd-api/src/main/java/com/yd/dal/service/customer/AclUserDALService.java

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclUser;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("aclUserDALService")
+public interface AclUserDALService {
+    List<AclUser> findByIds(List<Long> userIdList);
+}

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java

@@ -84,4 +84,8 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     public List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId) {
         return aclPractitionerMapper.ownOpportunityQuery(practitionerId);
     }
+    @Override
+    public List<AclPractitioner> findByIds(List<Long> practitionerIdList) {
+        return aclPractitionerMapper.findByIds(practitionerIdList);
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialAssignedTrackDALServiceImpl.java

@@ -6,6 +6,7 @@ import com.yd.dal.service.customer.AclPractitionerPotentialAssignedTrackDALServi
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Service("aclPractitionerPotentialAssignedTrackDALService")
@@ -17,4 +18,31 @@ public class AclPractitionerPotentialAssignedTrackDALServiceImpl implements AclP
     public void saveAll(List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList) {
         aclPractitionerPotentialAssignedTrackMapper.insertList(potentialAssignedTrackList);
     }
+
+    @Override
+    public List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(Long practitionerId, Long potentialId, Long trackStatusId, Date trackDate) {
+        return aclPractitionerPotentialAssignedTrackMapper.findByPractitionerIdAndPotentialIdAndTrackStatusId(practitionerId,potentialId,trackStatusId,trackDate);
+    }
+
+    @Override
+    public void save(AclPractitionerPotentialAssignedTrack assignedTrack) {
+        aclPractitionerPotentialAssignedTrackMapper.insertSelective(assignedTrack);
+    }
+
+    @Override
+    public List<AclPractitionerPotentialAssignedTrack> findByPotentialIdAndIsLasted(Long potentialId, int isLasted) {
+        return aclPractitionerPotentialAssignedTrackMapper.findByPotentialIdAndIsLasted(potentialId,isLasted);
+    }
+
+    @Override
+    public void updateAll(List<AclPractitionerPotentialAssignedTrack> assignedTrackUpdateList) {
+        for(AclPractitionerPotentialAssignedTrack item : assignedTrackUpdateList){
+            aclPractitionerPotentialAssignedTrackMapper.updateByPrimaryKeySelective(item);
+        }
+    }
+
+    @Override
+    public List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId) {
+        return aclPractitionerPotentialAssignedTrackMapper.findByPractitionerIdAndPotentialId(practitionerId,potentialId);
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialAssignedsDALServiceImpl.java

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds;
+import com.yd.dal.mapper.customer.AclPractitionerPotentialAssignedsMapper;
+import com.yd.dal.service.customer.AclPractitionerPotentialAssignedsDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("aclPractitionerPotentialAssignedsDALService")
+public class AclPractitionerPotentialAssignedsDALServiceImpl implements AclPractitionerPotentialAssignedsDALService {
+
+    @Resource
+    private AclPractitionerPotentialAssignedsMapper aclPractitionerPotentialAssignedsMapper;
+    @Override
+    public void saveAll(List<AclPractitionerPotentialAssigneds> potentialAssignedsList) {
+        aclPractitionerPotentialAssignedsMapper.insertList(potentialAssignedsList);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialDALServiceImpl.java

 package com.yd.dal.service.customer.impl;
 
+import com.yd.api.practitioner.vo.recruit.PractitionerPotentialInfo;
 import com.yd.dal.entity.customer.AclPractitionerPotential;
 import com.yd.dal.mapper.customer.AclPractitionerPotentialMapper;
 import com.yd.dal.service.customer.AclPractitionerPotentialDALService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service("aclPractitionerPotentialDALService")
 public class AclPractitionerPotentialDALServiceImpl implements AclPractitionerPotentialDALService {
 
@@ -18,6 +21,34 @@ public class AclPractitionerPotentialDALServiceImpl implements AclPractitionerPo
     }
 
     @Override
+    public int update(AclPractitionerPotential practitionerPotential) {
+        return aclPractitionerPotentialMapper.updateByPrimaryKeySelective(practitionerPotential);
+    }
+
+    @Override
+    public List<PractitionerPotentialInfo> findByPractitionerIdAndLasted(Long practitionerId) {
+        List<PractitionerPotentialInfo> temp = aclPractitionerPotentialMapper.findByPractitionerIdAndLasted(practitionerId);
+        Map<Long,PractitionerPotentialInfo> potentialInfoMap = new HashMap<>();
+        Long potentialId;
+        Long trackId,trackMaxId;
+        for(PractitionerPotentialInfo item :temp){
+            potentialId = item.getPotentialId();
+            trackId = item.getTrackId();
+            if(potentialInfoMap.containsKey(potentialId)){
+                trackMaxId = potentialInfoMap.get(potentialId).getTrackId();
+                if(trackMaxId < trackId){
+                    potentialInfoMap.put(potentialId,item);
+                }
+            }else{
+                potentialInfoMap.put(potentialId,item);
+            }
+        }
+        List<PractitionerPotentialInfo> result = new ArrayList<>(potentialInfoMap.values());
+        result.sort((o1, o2) -> o2.getPotentialId().compareTo(o1.getPotentialId()));
+        return result;
+    }
+
+    @Override
     public int save(AclPractitionerPotential practitionerPotential) {
         return aclPractitionerPotentialMapper.insert(practitionerPotential);
     }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclUserDALServiceImpl.java

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclUser;
+import com.yd.dal.mapper.customer.AclUserMapper;
+import com.yd.dal.service.customer.AclUserDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("aclUserDALService")
+public class AclUserDALServiceImpl implements AclUserDALService {
+    @Resource
+    private AclUserMapper aclUserMapper;
+    @Override
+    public List<AclUser> findByIds(List<Long> userIdList) {
+        return aclUserMapper.findByIds(userIdList);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/meta/MdDropOptionsDALService.java

 package com.yd.dal.service.meta;
-
+import org.springframework.stereotype.Service;
 import com.yd.dal.entity.meta.MdDropOptions;
 
 import java.util.List;
-
+@Service("mdDropOptionsDALService")
 public interface MdDropOptionsDALService {
     List<MdDropOptions> findByDropMasterId(long dropMasterId);
 
     MdDropOptions findByDropOptionId(Long dropOptionId);
 
     List<MdDropOptions> findByDropMasterCode(String dropMasterCode);
+
+    MdDropOptions findById(Long trackStatusId);
+
+    List<MdDropOptions> findByMasterCode(String masterCode);
+
+    List<MdDropOptions> findByMasterCodeAndOrderId(String masterCode, int orderId);
 }

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdDropOptionsDALServiceImpl.java

@@ -4,7 +4,6 @@ import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.mapper.meta.MdDropOptionsMapper;
 import com.yd.dal.service.meta.MdDropOptionsDALService;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.List;
 
@@ -30,4 +29,18 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
     public List<MdDropOptions> findByDropMasterCode(String dropMasterCode) {
         return mdDropOptionsMapper.findByDropMasterCode(dropMasterCode);
     }
+    @Override
+    public MdDropOptions findById(Long trackStatusId) {
+        return mdDropOptionsMapper.selectByPrimaryKey(trackStatusId);
+    }
+
+    @Override
+    public List<MdDropOptions> findByMasterCode(String masterCode) {
+        return mdDropOptionsMapper.findByMasterCode(masterCode);
+    }
+
+    @Override
+    public List<MdDropOptions> findByMasterCodeAndOrderId(String masterCode, int orderId) {
+        return mdDropOptionsMapper.findByMasterCodeAndOrderId(masterCode,orderId);
+    }
 }

yd-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -11,6 +11,7 @@
 800000=执行成功！
 ##系统提示信息
 810001=token无效或者错误！
+820001=为查询到相应结果。
 
 830001=该用户非寿险经纪人。
 830002=只有寿险经纪人才有权限进入！

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

@@ -705,4 +705,13 @@
       and a.assigned_practitioner_id = #{practitionerId}
     </if>
   </select>
+  <select id="findByIds" resultType="com.yd.dal.entity.customer.AclPractitioner">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner
+    where id in
+    <foreach collection="practitionerIdList" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yd.dal.mapper.customer.AclPractitionerPotentialAssignedsMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="assigned_practitioner_id" jdbcType="BIGINT" property="assignedPractitionerId" />
+    <result column="practitioner_potential_id" jdbcType="BIGINT" property="practitionerPotentialId" />
+    <result column="time_to_onboarding" jdbcType="TIMESTAMP" property="timeToOnboarding" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="updater_type" jdbcType="INTEGER" property="updaterType" />
+    <result column="creator_type" jdbcType="INTEGER" property="creatorType" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, assigned_practitioner_id, practitioner_potential_id, time_to_onboarding, is_active, 
+    created_at, created_by, updated_at, updated_by, updater_type, creator_type
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_potential_assigneds
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_acl_practitioner_potential_assigneds
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds" useGeneratedKeys="true">
+    insert into ag_acl_practitioner_potential_assigneds (assigned_practitioner_id, practitioner_potential_id, 
+      time_to_onboarding, is_active, created_at, 
+      created_by, updated_at, updated_by, 
+      updater_type, creator_type)
+    values (#{assignedPractitionerId,jdbcType=BIGINT}, #{practitionerPotentialId,jdbcType=BIGINT}, 
+      #{timeToOnboarding,jdbcType=TIMESTAMP}, #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}, 
+      #{updaterType,jdbcType=INTEGER}, #{creatorType,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds" useGeneratedKeys="true">
+    insert into ag_acl_practitioner_potential_assigneds
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="assignedPractitionerId != null">
+        assigned_practitioner_id,
+      </if>
+      <if test="practitionerPotentialId != null">
+        practitioner_potential_id,
+      </if>
+      <if test="timeToOnboarding != null">
+        time_to_onboarding,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+      <if test="updaterType != null">
+        updater_type,
+      </if>
+      <if test="creatorType != null">
+        creator_type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="assignedPractitionerId != null">
+        #{assignedPractitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerPotentialId != null">
+        #{practitionerPotentialId,jdbcType=BIGINT},
+      </if>
+      <if test="timeToOnboarding != null">
+        #{timeToOnboarding,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=BIGINT},
+      </if>
+      <if test="updaterType != null">
+        #{updaterType,jdbcType=INTEGER},
+      </if>
+      <if test="creatorType != null">
+        #{creatorType,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds">
+    update ag_acl_practitioner_potential_assigneds
+    <set>
+      <if test="assignedPractitionerId != null">
+        assigned_practitioner_id = #{assignedPractitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerPotentialId != null">
+        practitioner_potential_id = #{practitionerPotentialId,jdbcType=BIGINT},
+      </if>
+      <if test="timeToOnboarding != null">
+        time_to_onboarding = #{timeToOnboarding,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=BIGINT},
+      </if>
+      <if test="updaterType != null">
+        updater_type = #{updaterType,jdbcType=INTEGER},
+      </if>
+      <if test="creatorType != null">
+        creator_type = #{creatorType,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.customer.AclPractitionerPotentialAssigneds">
+    update ag_acl_practitioner_potential_assigneds
+    set assigned_practitioner_id = #{assignedPractitionerId,jdbcType=BIGINT},
+      practitioner_potential_id = #{practitionerPotentialId,jdbcType=BIGINT},
+      time_to_onboarding = #{timeToOnboarding,jdbcType=TIMESTAMP},
+      is_active = #{isActive,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      updater_type = #{updaterType,jdbcType=INTEGER},
+      creator_type = #{creatorType,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <insert id="insertList"  parameterType="java.util.List" useGeneratedKeys="true">
+    insert into ag_acl_practitioner_potential_assigneds (assigned_practitioner_id, practitioner_potential_id,
+                                                         time_to_onboarding, is_active, created_at,
+                                                         created_by, updated_at, updated_by,
+                                                         updater_type, creator_type)
+      values
+    <foreach collection="potentialAssignedsList" item="item" index="index" separator=",">
+      (
+      #{item.assignedPractitionerId},
+      #{item.practitionerPotentialId},
+      #{item.timeToOnboarding},
+      #{item.isActive},
+      #{item.createdAt},
+      #{item.createdBy},
+      #{item.updatedAt},
+      #{item.updatedBy},
+      #{item.updaterType},
+      #{item.creatorType}
+      )
+    </foreach>
+  </insert>
+
+</mapper>
\ No newline at end of file

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

@@ -24,12 +24,12 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
     <result column="creator_type" jdbcType="BIGINT" property="creatorType" />
-    <result column="updator_type" jdbcType="BIGINT" property="updatorType" />
+    <result column="updater_type" jdbcType="BIGINT" property="updaterType" />
   </resultMap>
   <sql id="Base_Column_List">
     id, customer_id,`name`, age, gender, mobile_no, wechat_id, qq_id, others_contacts, education_level,
     introducer, tag, remark, resource_drop_master_id, oss_path_resume, practitioner_assigned_ids,
-    is_active, created_at, created_by, updated_at, updated_by,creator_type,updator_type
+    is_active, created_at, created_by, updated_at, updated_by,creator_type,updater_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -48,14 +48,14 @@
       tag, remark, resource_drop_master_id, 
       oss_path_resume, practitioner_assigned_ids, is_active,
       created_at, created_by, updated_at, 
-      updated_by)
+      updated_by,updater_type,creator_type)
     values (#{name,jdbcType=VARCHAR},#{customerId,jdbcType=BIGINT}, #{age,jdbcType=BIGINT}, #{gender,jdbcType=INTEGER},
       #{mobileNo,jdbcType=VARCHAR}, #{wechatId,jdbcType=VARCHAR}, #{qqId,jdbcType=VARCHAR}, 
       #{othersContacts,jdbcType=VARCHAR}, #{educationLevel,jdbcType=VARCHAR}, #{introducer,jdbcType=VARCHAR}, 
       #{tag,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{resourceDropMasterId,jdbcType=BIGINT}, 
       #{ossPathResume,jdbcType=VARCHAR}, #{practitionerAssignedIds,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER},
       #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{updatedBy,jdbcType=BIGINT})
+      #{updatedBy,jdbcType=BIGINT},#{updaterType,jdbcType=INTEGER},#{creatorType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerPotential" useGeneratedKeys="true">
     insert into ag_acl_practitioner_potential
@@ -117,6 +117,12 @@
       <if test="updatedBy != null">
         updated_by,
       </if>
+      <if test="creatorType != null">
+        creator_type,
+      </if>
+      <if test="updaterType != null">
+        updater_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="name != null">
@@ -176,6 +182,12 @@
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="creatorType != null">
+        #{creatorType,jdbcType=INTEGER},
+      </if>
+      <if test="updaterType != null">
+        #{updaterType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitionerPotential">
@@ -220,7 +232,7 @@
       <if test="ossPathResume != null">
         oss_path_resume = #{ossPathResume,jdbcType=VARCHAR},
       </if>
-      <if test="practitionerAssignedId != null">
+      <if test="practitionerAssignedIds != null">
         practitioner_assigned_ids = #{practitionerAssignedIds,jdbcType=BIGINT},
       </if>
       <if test="isActive != null">
@@ -238,6 +250,12 @@
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
+      <if test="creatorType != null">
+        creator_type = #{creatorType,jdbcType=INTEGER},
+      </if>
+      <if test="updaterType != null">
+        updater_type = #{updaterType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -261,7 +279,9 @@
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       created_by = #{createdBy,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      updated_by = #{updatedBy,jdbcType=BIGINT}
+      updated_by = #{updatedBy,jdbcType=BIGINT},
+      creator_type = #{creatorType,jdbcType=INTEGER},
+      updater_type = #{updaterType,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="findByMobileNo" resultMap="BaseResultMap">
@@ -271,4 +291,31 @@
     where mobile_no = #{mobileNo,jdbcType=VARCHAR}
     and is_active = #{isActive,jdbcType=INTEGER}
   </select>
+    <select id="findByPractitionerIdAndLasted"
+            resultType="com.yd.api.practitioner.vo.recruit.PractitionerPotentialInfo">
+      SELECT
+        p.id potentialId,
+        p.`name` NAME,
+        p.gender gender,
+        p.age age,
+        p.mobile_no mobileNo,
+        p.wechat_id wechatId,
+        p.qq_id qqId,
+        p.others_contacts othersContacts,
+        p.education_level educationLevel,
+        p.resource_drop_master_id resourceDropMasterId,
+        p.introducer introducer,
+        p.tag tag,
+        p.remark remark,
+        p.oss_path_resume ossPathResume,
+        t.track_status_id trackStatusId,
+        t.id trackId,
+        date_format(p.created_at,'%Y-%m-%d') createdAt
+      FROM
+        ag_acl_practitioner_potential p
+          INNER JOIN ag_acl_practitioner_potential_assigned_track t ON p.id = t.practitioner_potential_id
+      WHERE
+        t.practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
+      order by p.id desc;
+    </select>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/meta/MdDropMasterMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yd.dal.mapper.meta.MdDropMasterMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.MdDropMaster">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="scenario_code" jdbcType="VARCHAR" property="scenarioCode" />
+    <result column="scenario_name" jdbcType="VARCHAR" property="scenarioName" />
+    <result column="drop_code" jdbcType="VARCHAR" property="dropCode" />
+    <result column="drop_name" jdbcType="VARCHAR" property="dropName" />
+    <result column="drop_code_desc" jdbcType="VARCHAR" property="dropCodeDesc" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, scenario_code, scenario_name, drop_code, drop_name, drop_code_desc, is_active, 
+    created_at, created_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_md_drop_master
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_md_drop_master
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdDropMaster" useGeneratedKeys="true">
+    insert into ag_md_drop_master (scenario_code, scenario_name, drop_code, 
+      drop_name, drop_code_desc, is_active, 
+      created_at, created_by)
+    values (#{scenarioCode,jdbcType=VARCHAR}, #{scenarioName,jdbcType=VARCHAR}, #{dropCode,jdbcType=VARCHAR}, 
+      #{dropName,jdbcType=VARCHAR}, #{dropCodeDesc,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdDropMaster" useGeneratedKeys="true">
+    insert into ag_md_drop_master
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="scenarioCode != null">
+        scenario_code,
+      </if>
+      <if test="scenarioName != null">
+        scenario_name,
+      </if>
+      <if test="dropCode != null">
+        drop_code,
+      </if>
+      <if test="dropName != null">
+        drop_name,
+      </if>
+      <if test="dropCodeDesc != null">
+        drop_code_desc,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="scenarioCode != null">
+        #{scenarioCode,jdbcType=VARCHAR},
+      </if>
+      <if test="scenarioName != null">
+        #{scenarioName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropCode != null">
+        #{dropCode,jdbcType=VARCHAR},
+      </if>
+      <if test="dropName != null">
+        #{dropName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropCodeDesc != null">
+        #{dropCodeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.meta.MdDropMaster">
+    update ag_md_drop_master
+    <set>
+      <if test="scenarioCode != null">
+        scenario_code = #{scenarioCode,jdbcType=VARCHAR},
+      </if>
+      <if test="scenarioName != null">
+        scenario_name = #{scenarioName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropCode != null">
+        drop_code = #{dropCode,jdbcType=VARCHAR},
+      </if>
+      <if test="dropName != null">
+        drop_name = #{dropName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropCodeDesc != null">
+        drop_code_desc = #{dropCodeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.meta.MdDropMaster">
+    update ag_md_drop_master
+    set scenario_code = #{scenarioCode,jdbcType=VARCHAR},
+      scenario_name = #{scenarioName,jdbcType=VARCHAR},
+      drop_code = #{dropCode,jdbcType=VARCHAR},
+      drop_name = #{dropName,jdbcType=VARCHAR},
+      drop_code_desc = #{dropCodeDesc,jdbcType=VARCHAR},
+      is_active = #{isActive,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/meta/MdDropOptionsMapper.xml

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yd.dal.mapper.meta.MdDropOptionsMapper">
   <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.MdDropOptions">
-    <!--@mbg.generated-->
-    <!--@Table ag_md_drop_options-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="drop_master_id" jdbcType="BIGINT" property="dropMasterId" />
     <result column="drop_option_name" jdbcType="VARCHAR" property="dropOptionName" />
@@ -16,24 +14,36 @@
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!--@mbg.generated-->
     id, drop_master_id, drop_option_name, drop_option_code, drop_option_order, drop_option_score, 
     drop_option_remark, is_active, created_at, created_by
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
     select 
     <include refid="Base_Column_List" />
     from ag_md_drop_options
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--@mbg.generated-->
+
+    <select id="findByMasterCode" resultType="com.yd.dal.entity.meta.MdDropOptions">
+      select
+      o.id id,
+      o.drop_master_id dropMasterId,
+      o.drop_option_name dropOptionName,
+      o.drop_option_code dropOptionCode,
+      o.drop_option_order dropOptionOrder,
+      o.drop_option_score dropOptionScore,
+      o.drop_option_remark dropOptionRemark,
+      o.is_active isActive,
+      o.created_at createdAt,
+      o.created_by createdBy
+      from ag_md_drop_master m left join ag_md_drop_options o on m.id = o.drop_master_id and o.is_active = 1
+      where m.scenario_code = #{masterCode,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from ag_md_drop_options
     where id = #{id,jdbcType=BIGINT}
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdDropOptions" useGeneratedKeys="true">
-    <!--@mbg.generated-->
     insert into ag_md_drop_options (drop_master_id, drop_option_name, drop_option_code, 
       drop_option_order, drop_option_score, drop_option_remark, 
       is_active, created_at, created_by
@@ -44,7 +54,6 @@
       )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdDropOptions" useGeneratedKeys="true">
-    <!--@mbg.generated-->
     insert into ag_md_drop_options
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="dropMasterId != null">
@@ -106,7 +115,6 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.meta.MdDropOptions">
-    <!--@mbg.generated-->
     update ag_md_drop_options
     <set>
       <if test="dropMasterId != null">
@@ -140,7 +148,6 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.meta.MdDropOptions">
-    <!--@mbg.generated-->
     update ag_md_drop_options
     set drop_master_id = #{dropMasterId,jdbcType=BIGINT},
       drop_option_name = #{dropOptionName,jdbcType=VARCHAR},
@@ -196,4 +203,19 @@
          LEFT JOIN ag_md_drop_master m ON m.id = o.drop_master_id
         WHERE m.scenario_code LIKE #{dropMasterCode,jdbcType=VARCHAR}
     </select>
+    <select id="findByMasterCodeAndOrderId" resultType="com.yd.dal.entity.meta.MdDropOptions">
+      select
+        o.id id,
+        o.drop_master_id dropMasterId,
+        o.drop_option_name dropOptionName,
+        o.drop_option_code dropOptionCode,
+        o.drop_option_order dropOptionOrder,
+        o.drop_option_score dropOptionScore,
+        o.drop_option_remark dropOptionRemark,
+        o.is_active isActive,
+        o.created_at createdAt,
+        o.created_by createdBy
+      from ag_md_drop_master m left join ag_md_drop_options o on m.id = o.drop_master_id and o.is_active = 1 and o.drop_option_order = #{orderId,jdbcType=INTEGER}
+      where m.scenario_code = #{masterCode,jdbcType=BIGINT}
+    </select>
 </mapper>
\ No newline at end of file