optimize

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

 package com.yd.api.practitioner.vo.recruit;
 package com.yd.api.practitioner.vo.recruit;
 
 
 public class AddRecruitTrackRequestVO {
 public class AddRecruitTrackRequestVO {
-    private Long trackId;
     private Long practitionerId;
     private Long practitionerId;
-    private Long practitionerPotentialId;
-    private Integer trackScore;
+    private Long potentialId;
     private Long trackStatusId;
     private Long trackStatusId;
     private String notice;
     private String notice;
     private Integer isActive;
     private Integer isActive;
 
 
-    public Long getTrackId() {
-        return trackId;
-    }
-
-    public void setTrackId(Long trackId) {
-        this.trackId = trackId;
-    }
 
 
     public Long getTrackStatusId() {
     public Long getTrackStatusId() {
         return trackStatusId;
         return trackStatusId;
@@ -49,19 +40,12 @@ public class AddRecruitTrackRequestVO {
         this.practitionerId = practitionerId;
         this.practitionerId = practitionerId;
     }
     }
 
 
-    public Long getPractitionerPotentialId() {
-        return practitionerPotentialId;
+    public Long getPotentialId() {
+        return potentialId;
     }
     }
 
 
-    public void setPractitionerPotentialId(Long practitionerPotentialId) {
-        this.practitionerPotentialId = practitionerPotentialId;
+    public void setPotentialId(Long potentialId) {
+        this.potentialId = potentialId;
     }
     }
 
 
-    public Integer getTrackScore() {
-        return trackScore;
-    }
-
-    public void setTrackScore(Integer trackScore) {
-        this.trackScore = trackScore;
-    }
 }
 }

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 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;
+    }
+}

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 {
 public class RecruitTrackQueryRequestVO {
     private Long potentialId;
     private Long potentialId;
-    private Long assignedId;
+    private Long practitionerId;
 
 
     public Long getPotentialId() {
     public Long getPotentialId() {
         return potentialId;
         return potentialId;
@@ -12,11 +12,11 @@ public class RecruitTrackQueryRequestVO {
         this.potentialId = potentialId;
         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;
 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/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

+package com.yd.dal.entity.meta;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_md_drop_options
+ * @author 
+ */
+@Data
+public class MdDropOptions implements Serializable {
+    /**
+     * 选项编号
+     */
+    private Long id;
+
+    /**
+     * 选单编号
+     */
+    private Long dropMasterId;
+
+    /**
+     * 选项名称
+     */
+    private String dropOptionName;
+
+    /**
+     * 选项数值
+     */
+    private String dropOptionCode;
+
+    /**
+     * 选项顺序
+     */
+    private Integer dropOptionOrder;
+
+    /**
+     * 选项分值
+     */
+    private Integer dropOptionScore;
+
+    /**
+     * 选项备注
+     */
+    private String dropOptionRemark;
+
+    /**
+     * 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

@@ -35,4 +35,6 @@ public interface AclPractitionerMapper {
     PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo")String mobileNo);
     PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo")String mobileNo);
 
 
     AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive")int isActive);
     AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive")int isActive);
+
+    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

@@ -19,5 +19,11 @@ public interface AclPractitionerPotentialAssignedTrackMapper {
 
 
     void insertList(@Param("potentialAssignedTrackList") List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
     void insertList(@Param("potentialAssignedTrackList") List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
 
 
-    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(@Param("practitionerId") Long practitionerId, @Param("potentialId")Long potentialId);
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(@Param("practitionerId") Long practitionerId, @Param("potentialId")Long potentialId,@Param("trackStatusId")Long trackStatusId);
+
+    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/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 {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MdDropOptions record);
+
+    int insertSelective(MdDropOptions record);
+
+    MdDropOptions selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MdDropOptions record);
+
+    int updateByPrimaryKey(MdDropOptions record);
+
+    List<MdDropOptions> findByMasterId(@Param("masterId") Long masterId);
+
+    List<MdDropOptions> findByMasterIdAndOrder(@Param("masterId")long masterId, @Param("orderId")int orderId);
+}
\ No newline at end of file

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

@@ -72,4 +72,11 @@ public interface AclPractitionerDALService {
      * @param practitioner
      * @param practitioner
      */
      */
     void updatePractitioner(AclPractitioner practitioner);
     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

@@ -10,5 +10,13 @@ public interface AclPractitionerPotentialAssignedTrackDALService {
 
 
     void saveAll(List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
     void saveAll(List<AclPractitionerPotentialAssignedTrack> potentialAssignedTrackList);
 
 
+    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(Long practitionerId, Long potentialId,Long trackStatusId);
+
+    void save(AclPractitionerPotentialAssignedTrack assignedTrack);
+
+    List<AclPractitionerPotentialAssignedTrack> findByPotentialIdAndIsLasted(Long potentialId, int isLasted);
+
+    void updateAll(List<AclPractitionerPotentialAssignedTrack> assignedTrackUpdateList);
+
     List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId);
     List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId);
 }
 }

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

@@ -78,4 +78,9 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     public void updatePractitioner(AclPractitioner practitioner) {
     public void updatePractitioner(AclPractitioner practitioner) {
         aclPractitionerMapper.updateByPrimaryKeySelective(practitioner);
         aclPractitionerMapper.updateByPrimaryKeySelective(practitioner);
     }
     }
+
+    @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

@@ -19,6 +19,26 @@ public class AclPractitionerPotentialAssignedTrackDALServiceImpl implements AclP
     }
     }
 
 
     @Override
     @Override
+    public List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialIdAndTrackStatusId(Long practitionerId, Long potentialId,Long trackStatusId) {
+        return aclPractitionerPotentialAssignedTrackMapper.findByPractitionerIdAndPotentialIdAndTrackStatusId(practitionerId,potentialId,trackStatusId);
+    }
+
+    @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) {
+        aclPractitionerPotentialAssignedTrackMapper.updateAll(assignedTrackUpdateList);
+    }
+
+    @Override
     public List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId) {
     public List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(Long practitionerId, Long potentialId) {
         return aclPractitionerPotentialAssignedTrackMapper.findByPractitionerIdAndPotentialId(practitionerId,potentialId);
         return aclPractitionerPotentialAssignedTrackMapper.findByPractitionerIdAndPotentialId(practitionerId,potentialId);
     }
     }

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 com.yd.dal.entity.meta.MdDropOptions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("mdDropOptionsDALService")
+public interface MdDropOptionsDALService {
+
+    MdDropOptions findById(Long trackStatusId);
+
+    List<MdDropOptions> findByMasterId(long masterId);
+
+    List<MdDropOptions> findByMasterIdAndOrder(long masterId, int orderId);
+}

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

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.entity.meta.MdDropOptions;
+import com.yd.dal.mapper.meta.MdDropOptionsMapper;
+import com.yd.dal.service.meta.MdDropOptionsDALService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("mdDropOptionsDALService")
+public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
+    @Autowired
+    private MdDropOptionsMapper mdDropOptionsMapper;
+    @Override
+    public MdDropOptions findById(Long trackStatusId) {
+        return mdDropOptionsMapper.selectByPrimaryKey(trackStatusId);
+    }
+
+    @Override
+    public List<MdDropOptions> findByMasterId(long masterId) {
+        return mdDropOptionsMapper.findByMasterId(masterId);
+    }
+
+    @Override
+    public List<MdDropOptions> findByMasterIdAndOrder(long masterId, int orderId) {
+        return mdDropOptionsMapper.findByMasterIdAndOrder(masterId,orderId);
+    }
+}

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

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

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

@@ -678,4 +678,13 @@
     where customer_id = #{customerId,jdbcType=BIGINT}
     where customer_id = #{customerId,jdbcType=BIGINT}
     and is_active = #{isActive,jdbcType=INTEGER}
     and is_active = #{isActive,jdbcType=INTEGER}
   </select>
   </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>
 </mapper>
\ No newline at end of file

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

@@ -27,14 +27,34 @@
     from ag_acl_practitioner_potential_assigned_track
     from ag_acl_practitioner_potential_assigned_track
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </select>
   </select>
-  <select id="findByPractitionerIdAndPotentialId"
-          resultType="com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack">
+  <select id="findByPractitionerIdAndPotentialIdAndTrackStatusId"
+          resultMap="BaseResultMap">
     select
     select
         <include refid="Base_Column_List" />
         <include refid="Base_Column_List" />
     from ag_acl_practitioner_potential_assigned_track
     from ag_acl_practitioner_potential_assigned_track
         where practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
         where practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
             AND practitioner_potential_id = #{potentialId,jdbcType=BIGINT}
             AND practitioner_potential_id = #{potentialId,jdbcType=BIGINT}
+            AND track_status_id = #{trackStatusId,jdbcType=BIGINT}
+            AND to_days(created_at) = to_days(now())
+  </select>
+  <select id="findByPotentialIdAndIsLasted"
+          resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_potential_assigned_track
+    where practitioner_potential_id = #{potentialId,jdbcType=BIGINT}
+    AND is_lasted = #{isLasted,jdbcType=INTEGER}
+  </select>
+  <select id="findByPractitionerIdAndPotentialId"
+         resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_potential_assigned_track
+    where practitioner_assigned_id = #{practitionerId,jdbcType=BIGINT}
+    AND practitioner_potential_id = #{potentialId,jdbcType=BIGINT}
+    order by created_at desc
   </select>
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from ag_acl_practitioner_potential_assigned_track
     delete from ag_acl_practitioner_potential_assigned_track
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
@@ -82,6 +102,15 @@
       <if test="updatedBy != null">
       <if test="updatedBy != null">
         updated_by,
         updated_by,
       </if>
       </if>
+      <if test="creatorType != null">
+        creator_type,
+      </if>
+      <if test="updatorType != null">
+        updator_type,
+      </if>
+      <if test="isLasted != null">
+        is_lasted,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="practitionerPotentialId != null">
       <if test="practitionerPotentialId != null">
@@ -93,6 +122,9 @@
       <if test="trackStatusId != null">
       <if test="trackStatusId != null">
         #{trackStatusId,jdbcType=BIGINT},
         #{trackStatusId,jdbcType=BIGINT},
       </if>
       </if>
+      <if test="trackScore != null">
+        #{trackScore,jdbcType=INTEGER},
+      </if>
       <if test="notice != null">
       <if test="notice != null">
         #{notice,jdbcType=VARCHAR},
         #{notice,jdbcType=VARCHAR},
       </if>
       </if>
@@ -111,6 +143,15 @@
       <if test="updatedBy != null">
       <if test="updatedBy != null">
         #{updatedBy,jdbcType=BIGINT},
         #{updatedBy,jdbcType=BIGINT},
       </if>
       </if>
+      <if test="creatorType != null">
+        #{creatorType,jdbcType=BIGINT},
+      </if>
+      <if test="updatorType != null">
+        #{updatorType,jdbcType=BIGINT},
+      </if>
+      <if test="isLasted != null">
+        #{isLasted,jdbcType=INTEGER},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="true" >
   <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="true" >
@@ -186,4 +227,51 @@
       updated_by = #{updatedBy,jdbcType=BIGINT}
       updated_by = #{updatedBy,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
   </update>
+  <update id="updateAll" parameterType="java.util.List">
+    <foreach collection="assignedTrackUpdateList" item = "item" index="index" separator=";">
+      update ag_acl_practitioner_potential_assigned_track
+      <set>
+        <if test="item.practitionerPotentialId != null">
+          practitioner_potential_id = #{item.practitionerPotentialId,jdbcType=BIGINT},
+        </if>
+        <if test="item.practitionerAssignedId != null">
+          practitioner_assigned_id = #{item.practitionerAssignedId,jdbcType=BIGINT},
+        </if>
+        <if test="item.trackStatusId != null">
+          track_status_id = #{item.trackStatusId,jdbcType=BIGINT},
+        </if>
+        <if test="item.trackScore != null">
+          track_score = #{item.trackScore,jdbcType=INTEGER},
+        </if>
+        <if test="item.notice != null">
+          notice = #{item.notice,jdbcType=VARCHAR},
+        </if>
+        <if test="item.isActive != null">
+          is_active = #{item.isActive,jdbcType=INTEGER},
+        </if>
+        <if test="item.createdAt != null">
+          created_at = #{item.createdAt,jdbcType=TIMESTAMP},
+        </if>
+        <if test="item.createdBy != null">
+          created_by = #{item.createdBy,jdbcType=BIGINT},
+        </if>
+        <if test="item.updatedAt != null">
+          updated_at = #{item.updatedAt,jdbcType=TIMESTAMP},
+        </if>
+        <if test="item.updatedBy != null">
+          updated_by = #{item.updatedBy,jdbcType=BIGINT},
+        </if>
+        <if test="item.creatorType != null">
+          creator_type = #{item.creatorType,jdbcType=INTEGER},
+        </if>
+        <if test="item.updatorType != null">
+          updator_type = #{item.updatorType,jdbcType=INTEGER},
+        </if>
+        <if test="item.isLasted != null">
+          is_lasted = #{item.isLasted,jdbcType=INTEGER},
+        </if>
+      </set>
+      where id = #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </update>
 </mapper>
 </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

+<?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.MdDropOptionsMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.MdDropOptions">
+    <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" />
+    <result column="drop_option_code" jdbcType="VARCHAR" property="dropOptionCode" />
+    <result column="drop_option_order" jdbcType="INTEGER" property="dropOptionOrder" />
+    <result column="drop_option_score" jdbcType="INTEGER" property="dropOptionScore" />
+    <result column="drop_option_remark" jdbcType="VARCHAR" property="dropOptionRemark" />
+    <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, 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">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_md_drop_options
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+    <select id="findByMasterId" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from ag_md_drop_options
+      where drop_master_id = #{masterId,jdbcType=BIGINT} AND is_active = 1
+    </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">
+    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
+      )
+    values (#{dropMasterId,jdbcType=BIGINT}, #{dropOptionName,jdbcType=VARCHAR}, #{dropOptionCode,jdbcType=VARCHAR}, 
+      #{dropOptionOrder,jdbcType=INTEGER}, #{dropOptionScore,jdbcType=INTEGER}, #{dropOptionRemark,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.MdDropOptions" useGeneratedKeys="true">
+    insert into ag_md_drop_options
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="dropMasterId != null">
+        drop_master_id,
+      </if>
+      <if test="dropOptionName != null">
+        drop_option_name,
+      </if>
+      <if test="dropOptionCode != null">
+        drop_option_code,
+      </if>
+      <if test="dropOptionOrder != null">
+        drop_option_order,
+      </if>
+      <if test="dropOptionScore != null">
+        drop_option_score,
+      </if>
+      <if test="dropOptionRemark != null">
+        drop_option_remark,
+      </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="dropMasterId != null">
+        #{dropMasterId,jdbcType=BIGINT},
+      </if>
+      <if test="dropOptionName != null">
+        #{dropOptionName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropOptionCode != null">
+        #{dropOptionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="dropOptionOrder != null">
+        #{dropOptionOrder,jdbcType=INTEGER},
+      </if>
+      <if test="dropOptionScore != null">
+        #{dropOptionScore,jdbcType=INTEGER},
+      </if>
+      <if test="dropOptionRemark != null">
+        #{dropOptionRemark,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.MdDropOptions">
+    update ag_md_drop_options
+    <set>
+      <if test="dropMasterId != null">
+        drop_master_id = #{dropMasterId,jdbcType=BIGINT},
+      </if>
+      <if test="dropOptionName != null">
+        drop_option_name = #{dropOptionName,jdbcType=VARCHAR},
+      </if>
+      <if test="dropOptionCode != null">
+        drop_option_code = #{dropOptionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="dropOptionOrder != null">
+        drop_option_order = #{dropOptionOrder,jdbcType=INTEGER},
+      </if>
+      <if test="dropOptionScore != null">
+        drop_option_score = #{dropOptionScore,jdbcType=INTEGER},
+      </if>
+      <if test="dropOptionRemark != null">
+        drop_option_remark = #{dropOptionRemark,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.MdDropOptions">
+    update ag_md_drop_options
+    set drop_master_id = #{dropMasterId,jdbcType=BIGINT},
+      drop_option_name = #{dropOptionName,jdbcType=VARCHAR},
+      drop_option_code = #{dropOptionCode,jdbcType=VARCHAR},
+      drop_option_order = #{dropOptionOrder,jdbcType=INTEGER},
+      drop_option_score = #{dropOptionScore,jdbcType=INTEGER},
+      drop_option_remark = #{dropOptionRemark,jdbcType=VARCHAR},
+      is_active = #{isActive,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+    <select id="findByMasterIdAndOrder" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from ag_md_drop_options
+      where drop_master_id = #{masterId,jdbcType=BIGINT}
+        AND is_active = 1
+        AND drop_option_order = #{orderId,jdbcType=INTEGER}
+    </select>
+</mapper>
\ No newline at end of file