增加-经纪人查询线索详情(暂存)

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -5,6 +5,8 @@ import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.media.MediaGetReqVO;
 import com.yd.api.practitioner.vo.media.MediaGetRespVO;
+import com.yd.api.practitioner.vo.opportunity.OwnOpportunityDetailQueryRequestVO;
+import com.yd.api.practitioner.vo.opportunity.OwnOpportunityDetailQueryResponseVO;
 import com.yd.api.practitioner.vo.opportunity.OwnOpportunityQueryRequestVO;
 import com.yd.api.practitioner.vo.opportunity.OwnOpportunityQueryResponseVO;
 import com.yd.api.practitioner.vo.rank.PractitionerRankRequestVO;
@@ -115,4 +117,18 @@ public class PractitionerController {
         result.setData(responseVO);
         return result;
     }
+
+    /***
+     * 经纪人查询自己的商机详情查询
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/ownOpportunityDetailQuery")
+    public Object ownOpportunityDetailQuery(@RequestBody OwnOpportunityDetailQueryRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        OwnOpportunityDetailQueryResponseVO responseVO = practitionerService.ownOpportunityDetailQuery(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
 }

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerService.java

@@ -4,6 +4,8 @@ import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.media.MediaGetReqVO;
 import com.yd.api.practitioner.vo.media.MediaGetRespVO;
+import com.yd.api.practitioner.vo.opportunity.OwnOpportunityDetailQueryRequestVO;
+import com.yd.api.practitioner.vo.opportunity.OwnOpportunityDetailQueryResponseVO;
 import com.yd.api.practitioner.vo.opportunity.OwnOpportunityQueryRequestVO;
 import com.yd.api.practitioner.vo.opportunity.OwnOpportunityQueryResponseVO;
 import com.yd.api.practitioner.vo.rank.PractitionerRankRequestVO;
@@ -62,4 +64,11 @@ public interface PractitionerService {
      * @return
      */
     OwnOpportunityQueryResponseVO ownOpportunityQuery(OwnOpportunityQueryRequestVO requestVO);
+
+    /**
+     * 经纪人查询自己的商机详情查询
+     * @param requestVO
+     * @return
+     */
+    OwnOpportunityDetailQueryResponseVO ownOpportunityDetailQuery(OwnOpportunityDetailQueryRequestVO requestVO);
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunityBasicInformationInfo.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class OpportunityBasicInformationInfo {
+
+    private Long opportunityId;
+    private String name;
+    private Long age;
+    private Integer gender;
+    private String mobileNo;
+    private String weChat;//微信号
+    private String otherContacts;//其他类型方式
+    private String sourceChannel;//商机来源
+    private String address;
+    private String opportunityDate;
+    private  Long mdDropOptionId;
+    private List<OpportunityCustomerTag> opportunityCustomerTags;
+
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunityConsultationInfo.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class OpportunityConsultationInfo {
+
+    private Long orderId;
+    private Long isCompletedQuestionnaire;
+    private List<OpportunitySurveyAnswers> opportunitySurveyAnswersList;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunityCustomerTag.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+@Data
+public class OpportunityCustomerTag {
+    private Long tagId;
+    private String tagName;
+
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunityRecordInfo.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+@Data
+public class OpportunityRecordInfo {
+    private Long id;//serial idPRIauto_increment
+    private String salesNotice;//询服务订单销售记录(营销填写)类似回访记录
+    private Integer isActive;//0=No, 1=Yes
+    private String noticeDate;
+    private Long practitionerId;
+    private Long opportunityId;
+    private Long mdDropOptionId;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunitySurveyAnswers.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class OpportunitySurveyAnswers {
+
+    private String questionName;//问题
+    private List<String> optionName;//答案
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OwnOpportunityDetailQueryRequestVO.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+@Data
+public class OwnOpportunityDetailQueryRequestVO {
+    private Long practitionerId;
+    private Long opportunityId;//商机Id，客户的customerId
+    private Long orderId;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OwnOpportunityDetailQueryResponseVO.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class OwnOpportunityDetailQueryResponseVO {
+    private OpportunityBasicInformationInfo opportunityBasicInformationInfo;//基本信息
+    private OpportunityConsultationInfo opportunityConsultationInfo;//服务咨询
+    private List<OpportunityRecordInfo> opportunityRecordInfos;//商机跟进
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OwnOpportunityQueryResponseVO.java

@@ -2,7 +2,7 @@ package com.yd.api.practitioner.vo.opportunity;
 
 
 import com.yd.api.result.CommonResult;
-import com.yd.dal.entity.opportunity.OwnOpportunityInfo;
+import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import lombok.Data;
 
 import java.util.List;

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

+package com.yd.dal.entity.customer;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_acl_customer
+ * @author 
+ */
+@Data
+public class AclCustomer implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 1= Staff 2=Customer 3=Partner 6=VIP 9=Car Insurance Chanel
+     */
+    private Integer role;
+
+    /**
+     * customer# for referral use -######## = login ID 
+     */
+    private String accountId;
+
+    private String login;
+
+    private String mobileNo;
+
+    /**
+     * for mobile
+     */
+    private String authenCode;
+
+    /**
+     * for staff or partner
+     */
+    private String password;
+
+    private String email;
+
+    /**
+     * FK ag_md_province.id 省
+     */
+    private Long provinceId;
+
+    /**
+     * FK ag_md_city.id 城市
+     */
+    private Long cityId;
+
+    /**
+     * FK ag_md_district.id 县(区)
+     */
+    private Long districtId;
+
+    /**
+     * mailing address
+     */
+    private String address;
+
+    /**
+     * FK ag_md_industry_occupation.id
+     */
+    private Long occupationId;
+
+    /**
+     * 1=普通会员 2=黄金会员 3=白金会员 4=黑金会员 5=钻石会员  
+     */
+    private Integer cusLevel;
+
+    /**
+     * Chinese Name
+     */
+    private String name;
+
+    /**
+     * 自行编辑昵称
+     */
+    private String nicknameModify;
+
+    /**
+     * Englsih First name
+     */
+    private String enFirstname;
+
+    /**
+     * English Last name
+     */
+    private String enLastname;
+
+    /**
+     * ag_md_id_type.id
+     */
+    private Long idTypeId;
+
+    private String idNo;
+
+    /**
+     * 1=Male, 2=Female
+     */
+    private Integer gender;
+
+    /**
+     * 0000-00-00
+     */
+    private Date birthDate;
+
+    private Date lastLoginTime;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 0=逐单提现, 1=对冲记录提现
+     */
+    private Integer withdrawType;
+
+    private BigDecimal referralRate;
+
+    private BigDecimal referralTotalAmount;
+
+    /**
+     * FK ag_acl_channel_referral_rate.id 角色渠道推荐佣金比率对应
+     */
+    private Long channelReferralRateId;
+
+    /**
+     * URL path of of Customer picture
+     */
+    private String imagePath;
+
+    /**
+     * 微信客户标识,对当前开发账户唯一
+     */
+    private String wechatOpenid;
+
+    /**
+     * 银盾经纪公众号的微信客户标识,对当前开发账户唯一
+     */
+    private String ydWechatOpenid;
+
+    /**
+     * 微信调接昵称
+     */
+    private String nickname;
+
+    /**
+     * FK ag_system_dept.id
+     */
+    private Long deptId;
+
+    /**
+     * FK ag_system_role.id
+     */
+    private Long roleId;
+
+    /**
+     * 创建时间
+     */
+    private Date createdAt;
+
+    /**
+     * 创建人
+     */
+    private Long createdBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updatedAt;
+
+    private Long updatedBy;
+
+    /**
+     * 推荐达人等级 1=一袋达人 2=二袋达人 3=三袋达人 4=四袋达人 5=五袋达人
+     */
+    private Integer referralLevel;
+
+    /**
+     * 执业者编号(登记代理人资格)
+     */
+    private String practitionerRegNo;
+
+    /**
+     * 所属公司(登记代理人资格)
+     */
+    private String practitionerRegCompany;
+
+    /**
+     * 执业证有效日期(登记代理人资格)
+     */
+    private Date practitionerRegExpirydate;
+
+    /**
+     * 执业证是否有效 0=无效, 1=有效
+     */
+    private Integer practitionerRegStatus;
+
+    /**
+     * 执业者教育程度 1博士 2硕士 3本科 4大专 5高中及同等学历 6初中及同等学历 7初中以下学历
+     */
+    private Integer practitionerRegEducationLevel;
+
+    /**
+     * 执业登记姓名
+     */
+    private String practitionerRegName;
+
+    /**
+     * 执业登记者的证件类型 FK ag_md_id_type, 1=身份证 2=护照 4=台胞证 5=香港身份证
+     */
+    private Integer practitionerIdTypeId;
+
+    /**
+     * 执业登记者的证件号
+     */
+    private String practitionerIdNo;
+
+    /**
+     * 执业登记者的生日
+     */
+    private Date practitionerBirthdate;
+
+    /**
+     * 执业登记者的性别 1=Male, 2=Female
+     */
+    private Integer practitionerGender;
+
+    /**
+     * 执业登记者大头照存放的URL
+     */
+    private String practitionerPortaitUrl;
+
+    /**
+     * 营销投放渠道来源 hmsr
+     */
+    private String sourceChannel;
+
+    /**
+     * 活动
+     */
+    private String mktCampaign;
+
+    /**
+     * 活动任务
+     */
+    private String mktTask;
+
+    /**
+     * 营销投放产品名 hmpl
+     */
+    private String sourcePlanName;
+
+    /**
+     * 营销投放推送日期 hmkw
+     */
+    private String sourcePublishdate;
+
+    /**
+     * 营销投放推送文章或其他 hmci
+     */
+    private String sourceArticle;
+
+    /**
+     * 微信号
+     */
+    private String wechatNo;
+
+    /**
+     * 其他联系方式
+     */
+    private String otherContacts;
+
+    /**
+     * 年龄
+     */
+    private Long age;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsAssignedTrack.java

+package com.yd.dal.entity.marketing;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_mkt_leads_assigned_track
+ * @author 
+ */
+@Data
+public class MktLeadsAssignedTrack implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * FK ag_po_order.id 9元咨询服务订单销售记录（营销填写）
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 询服务订单销售记录(营销填写)类似回访记录
+     */
+    private String salesNotice;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 分析建置时间
+     */
+    private Date createdAt;
+
+    /**
+     * 建置者 FK ag_acl_user.id
+     */
+    private Long createdBy;
+
+    /**
+     * 创建者类型:1为user id（AGMS），2为本人practitioner id（银盾经纪）
+     */
+    private Integer creatorType;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedAt;
+
+    /**
+     * 更新者 FK ag_acl_user.id
+     */
+    private Long updatedBy;
+
+    /**
+     * 更新者类型:1为user id（AGMS），2为本人practitioner id（银盾经纪）
+     */
+    private Integer updatorType;
+
+    /**
+     * 经纪人id
+     */
+    private Long practitionerId;
+
+    /**
+     * 经纪人商机对应的客户id
+     */
+    private Long customerId;
+
+    /**
+     * ag_md_drop_options.id 销售活动
+     */
+    private Long mdDropOptionId;
+
+    /**
+     * 线索发掘活动分值快照
+     */
+    private Integer trackScore;
+
+    /**
+     * FK ag_mkt_leads_assigneds.id 线索指派表
+     */
+    private Long leadsAssignedId;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsAssigneds.java

+package com.yd.dal.entity.marketing;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_mkt_leads_assigneds
+ * @author 
+ */
+@Data
+public class MktLeadsAssigneds implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 经纪人id
+     */
+    private Long assignedPractitionerId;
+
+    /**
+     * 经纪人商机对应的客户id
+     */
+    private Long customerId;
+
+    /**
+     * 首年保费
+     */
+    private BigDecimal fyp;
+
+    /**
+     * 首年佣金
+     */
+    private BigDecimal fyc;
+
+    /**
+     * 预计成交时间
+     */
+    private Date timeToClose;
+
+    /**
+     * 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;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.yd.dal.entity.meta;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_md_mk_campaign
+ * @author 
+ */
+@Data
+public class MdMkCampaign implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 推广名称
+     */
+    private String name;
+
+    /**
+     * 推广编码
+     */
+    private String code;
+
+    /**
+     * 推广名称
+     */
+    private String content;
+
+    /**
+     * 推广金额
+     */
+    private BigDecimal reward;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * UI上显示给用户的红包数量
+     */
+    private Integer uiDisplayCount;
+
+    /**
+     * 推广起始日
+     */
+    private Date effectiveStartDate;
+
+    /**
+     * 推广结束日
+     */
+    private Date effectiveEndDate;
+
+    /**
+     * FK ag_system_dept.id
+     */
+    private Long deptId;
+
+    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/MdTag.java

+package com.yd.dal.entity.meta;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_md_tag
+ * @author 
+ */
+@Data
+public class MdTag implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 1=方案\产品\产品分类\方案 2=客户
+     */
+    private Long tagType;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 1=active 2=inactive
+     */
+    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;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.yd.dal.entity.meta;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * ag_object_collection_tagged
+ * @author 
+ */
+@Data
+public class ObjectCollectionTagged implements Serializable {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * FK ag_md_tag.id
+     */
+    private Integer mdTagId;
+
+    /**
+     * 1=方案 2=产品 3=产品分类 4=客户 5=评价，对应类型id的集合tag_object_id（planId, productId,productCategoryId,planCategoryId,customerId,feedbackId）
+     */
+    private Integer taggedObjectType;
+
+    /**
+     * 便签对象id FK object table key id
+     */
+    private Long taggedObjectId;
+
+    /**
+     * 1=active 2=inactive
+     */
+    private Integer isActive;
+
+    /**
+     * 产品列表中推荐排序
+     */
+    private Integer recommendOrder;
+
+    /**
+     * UI产品列表中缺省的显示排序，推荐排序优先级高
+     */
+    private Integer displayOrder;
+
+    private Date createdAt;
+
+    /**
+     * FK ag_acl_user.id
+     */
+    private Long createdBy;
+
+    private Date updatedAt;
+
+    /**
+     * 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/opportunity/OwnOpportunityInfo.java → yd-api/src/main/java/com/yd/dal/entity/practitioner/opportunity/OwnOpportunityInfo.java

-package com.yd.dal.entity.opportunity;
+package com.yd.dal.entity.practitioner.opportunity;
 
 import lombok.Data;
 

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

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

yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsAssignedTrackMapper.java

+package com.yd.dal.mapper.marketing;
+
+import com.github.pagehelper.Page;
+import com.yd.dal.entity.marketing.MktLeadsAssignedTrack;
+
+public interface MktLeadsAssignedTrackMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MktLeadsAssignedTrack record);
+
+    int insertSelective(MktLeadsAssignedTrack record);
+
+    MktLeadsAssignedTrack selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MktLeadsAssignedTrack record);
+
+    int updateByPrimaryKey(MktLeadsAssignedTrack record);
+
+    Page<MktLeadsAssignedTrack> selectByPrimaryKeySelective(MktLeadsAssignedTrack mktLeadsAssignedTrack);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsAssignedsMapper.java

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

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

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

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

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

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

+package com.yd.dal.mapper.meta;
+
+import com.yd.dal.entity.meta.ObjectCollectionTagged;
+
+import java.util.List;
+
+public interface ObjectCollectionTaggedMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ObjectCollectionTagged record);
+
+    int insertSelective(ObjectCollectionTagged record);
+
+    ObjectCollectionTagged selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ObjectCollectionTagged record);
+
+    int updateByPrimaryKey(ObjectCollectionTagged record);
+
+    List<ObjectCollectionTagged> findByObjectCollectionTagged(ObjectCollectionTagged objectCollectionTagged);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/opportunity/OpportunityMapper.java

-package com.yd.dal.mapper.opportunity;
-
-import com.yd.dal.entity.opportunity.OwnOpportunityInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface OpportunityMapper {
-    List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId") Long practitionerId);
-}

yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerMapper.java

 package com.yd.dal.mapper.practitioner;
 
+import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
@@ -19,4 +20,6 @@ public interface PractitionerMapper {
     List<PractitionerRankInfo> getPractitionerRankInfoForSpecials(@Param("mobileSpecials") List<String> mobileSpecials, @Param("time")Integer time);
 
     PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo")String mobileNo);
+
+    List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId") Long practitionerId);
 }

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

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclCustomer;
+
+public interface AclCustomerDALService {
+    AclCustomer findByCustomerId(Long customerId);
+}

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

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclCustomer;
+import com.yd.dal.mapper.customer.AclCustomerMapper;
+import com.yd.dal.service.customer.AclCustomerDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("aclCustomerDALService")
+public class AclCustomerDALServiceImpl implements AclCustomerDALService {
+    @Resource
+    private AclCustomerMapper aclCustomerMapper;
+
+    @Override
+    public AclCustomer findByCustomerId(Long customerId) {
+        return aclCustomerMapper.selectByPrimaryKey(customerId);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsAssignedTrackDALServiceImpl.java

+package com.yd.dal.service.marketing.Impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.yd.dal.entity.marketing.MktLeadsAssignedTrack;
+import com.yd.dal.mapper.marketing.MktLeadsAssignedTrackMapper;
+import com.yd.dal.service.marketing.MktLeadsAssignedTrackDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("mktLeadsAssignedTrackDALService")
+public class MktLeadsAssignedTrackDALServiceImpl implements MktLeadsAssignedTrackDALService {
+    @Resource
+    private MktLeadsAssignedTrackMapper mktLeadsAssignedTrackMapper;
+
+    @Override
+    public List<MktLeadsAssignedTrack> findByMktLeadsAssignedTrack(MktLeadsAssignedTrack mktLeadsAssignedTrack) {
+        Page<MktLeadsAssignedTrack> destList =  mktLeadsAssignedTrackMapper.selectByPrimaryKeySelective(mktLeadsAssignedTrack);
+        PageInfo<MktLeadsAssignedTrack> pageInfo = new PageInfo<>(destList);
+        List<MktLeadsAssignedTrack> list = pageInfo.getList();
+        return list;
+    }
+}

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsAssignedsDALServiceImpl.java

+package com.yd.dal.service.marketing.Impl;
+
+import com.yd.dal.entity.marketing.MktLeadsAssigneds;
+import com.yd.dal.mapper.marketing.MktLeadsAssignedsMapper;
+import com.yd.dal.service.marketing.MktLeadsAssignedsDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("mktLeadsAssignedsDALService")
+public class MktLeadsAssignedsDALServiceImpl implements MktLeadsAssignedsDALService {
+    @Resource
+    private MktLeadsAssignedsMapper mktLeadsAssignedsMapper;
+
+    @Override
+    public MktLeadsAssigneds findByMktLeadsAssigneds(MktLeadsAssigneds mktLeadsAssigneds) {
+        return mktLeadsAssignedsMapper.findByMktLeadsAssigneds(mktLeadsAssigneds);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsAssignedTrackDALService.java

+package com.yd.dal.service.marketing;
+
+import com.yd.dal.entity.marketing.MktLeadsAssignedTrack;
+
+import java.util.List;
+
+public interface MktLeadsAssignedTrackDALService {
+    List<MktLeadsAssignedTrack> findByMktLeadsAssignedTrack(MktLeadsAssignedTrack mktLeadsAssignedTrack);
+}

yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsAssignedsDALService.java

+package com.yd.dal.service.marketing;
+
+import com.yd.dal.entity.marketing.MktLeadsAssigneds;
+
+public interface MktLeadsAssignedsDALService {
+    MktLeadsAssigneds findByMktLeadsAssigneds(MktLeadsAssigneds mktLeadsAssigneds);
+}

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

+package com.yd.dal.service.meta;
+
+import com.yd.dal.entity.meta.MdMkCampaign;
+
+public interface MdMkCampaignDALService {
+    MdMkCampaign findByMktCampaignId(Long mktCampaignId);
+}

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

+package com.yd.dal.service.meta;
+
+import com.yd.dal.entity.meta.MdTag;
+
+import java.util.List;
+
+public interface MdTagDALService {
+    List<MdTag> findByTagIdIn(List<Long> tagIds);
+}

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

+package com.yd.dal.service.meta;
+
+import com.yd.dal.entity.meta.ObjectCollectionTagged;
+
+import java.util.List;
+
+public interface ObjectCollectionTaggedDALService {
+    List<ObjectCollectionTagged> findByObjectCollectionTagged(ObjectCollectionTagged objectCollectionTagged);
+}

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

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.entity.meta.MdMkCampaign;
+import com.yd.dal.mapper.meta.MdMkCampaignMapper;
+import com.yd.dal.service.meta.MdMkCampaignDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("mdMkCampaignDALService")
+public class MdMkCampaignDALServiceImpl implements MdMkCampaignDALService {
+    @Resource
+    private MdMkCampaignMapper mdMkCampaignMapper;
+
+    @Override
+    public MdMkCampaign findByMktCampaignId(Long mktCampaignId) {
+        return mdMkCampaignMapper.selectByPrimaryKey(mktCampaignId);
+    }
+}

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

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.entity.meta.MdTag;
+import com.yd.dal.mapper.meta.MdTagMapper;
+import com.yd.dal.service.meta.MdTagDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("mdTagDALService")
+public class MdTagDALServiceImpl implements MdTagDALService {
+    @Resource
+    private MdTagMapper mdTagMapper;
+    @Override
+    public List<MdTag> findByTagIdIn(List<Long> tagIds) {
+        return mdTagMapper.findByTagIdIn(tagIds);
+    }
+}

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

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.entity.meta.ObjectCollectionTagged;
+import com.yd.dal.mapper.meta.ObjectCollectionTaggedMapper;
+import com.yd.dal.service.meta.ObjectCollectionTaggedDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("objectCollectionTaggedDALService")
+public class ObjectCollectionTaggedDALServiceImpl implements ObjectCollectionTaggedDALService {
+    @Resource
+    private ObjectCollectionTaggedMapper objectCollectionTaggedMapper;
+
+    @Override
+    public List<ObjectCollectionTagged> findByObjectCollectionTagged(ObjectCollectionTagged objectCollectionTagged) {
+        return objectCollectionTaggedMapper.findByObjectCollectionTagged(objectCollectionTagged);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/opportunity/Impl/OpportunityDALServiceImpl.java

-package com.yd.dal.service.opportunity.Impl;
-
-import com.yd.dal.entity.opportunity.OwnOpportunityInfo;
-import com.yd.dal.mapper.opportunity.OpportunityMapper;
-import com.yd.dal.service.opportunity.OpportunityDALService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service("opportunityDALService")
-public class OpportunityDALServiceImpl implements OpportunityDALService {
-    @Resource
-    private OpportunityMapper opportunityMapper;
-
-
-    @Override
-    public List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId) {
-        return opportunityMapper.ownOpportunityQuery(practitionerId);
-    }
-}

yd-api/src/main/java/com/yd/dal/service/opportunity/OpportunityDALService.java

-package com.yd.dal.service.opportunity;
-
-import com.yd.dal.entity.opportunity.OwnOpportunityInfo;
-
-import java.util.List;
-
-public interface OpportunityDALService {
-
-    List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId);
-}

yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerDALService.java

@@ -5,6 +5,7 @@ import com.yd.dal.entity.practitioner.AclPractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
+import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 
 import java.util.List;
 
@@ -63,4 +64,10 @@ public interface PractitionerDALService {
      */
     void updatePractitioner(AclPractitionerInfo practitioner);
 
+    /**
+     * 经纪人查询自己的商机
+     * @param practitionerId
+     * @return
+     */
+    List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId);
 }

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

@@ -5,6 +5,7 @@ import com.yd.dal.entity.practitioner.AclPractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
+import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.mapper.practitioner.AclPractitionerMapper;
 import com.yd.dal.mapper.practitioner.PractitionerMapper;
 import com.yd.dal.service.customer.impl.CustomerDALServiceImpl;
@@ -77,4 +78,9 @@ public class PractitionerDALServiceImpl implements PractitionerDALService {
     public void updatePractitioner(AclPractitionerInfo practitioner) {
         aclPractitionerMapper.updateByPrimaryKeySelective(practitioner);
     }
+
+    @Override
+    public List<OwnOpportunityInfo> ownOpportunityQuery(Long practitionerId) {
+        return practitionerMapper.ownOpportunityQuery(practitionerId);
+    }
 }

yd-api/src/main/resources/mapper/marketing/MktLeadsAssignedsMapper.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.marketing.MktLeadsAssignedsMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.marketing.MktLeadsAssigneds">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="assigned_practitioner_id" jdbcType="BIGINT" property="assignedPractitionerId" />
+    <result column="customer_id" jdbcType="BIGINT" property="customerId" />
+    <result column="FYP" jdbcType="DECIMAL" property="fyp" />
+    <result column="FYC" jdbcType="DECIMAL" property="fyc" />
+    <result column="time_to_close" jdbcType="TIMESTAMP" property="timeToClose" />
+    <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" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, assigned_practitioner_id, customer_id, FYP, FYC, time_to_close, is_active, created_at, 
+    created_by, updated_at, updated_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_mkt_leads_assigneds
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_mkt_leads_assigneds
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsAssigneds" useGeneratedKeys="true">
+    insert into ag_mkt_leads_assigneds (assigned_practitioner_id, customer_id, 
+      FYP, FYC, time_to_close, 
+      is_active, created_at, created_by, 
+      updated_at, updated_by)
+    values (#{assignedPractitionerId,jdbcType=BIGINT}, #{customerId,jdbcType=BIGINT}, 
+      #{fyp,jdbcType=DECIMAL}, #{fyc,jdbcType=DECIMAL}, #{timeToClose,jdbcType=TIMESTAMP}, 
+      #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsAssigneds" useGeneratedKeys="true">
+    insert into ag_mkt_leads_assigneds
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="assignedPractitionerId != null">
+        assigned_practitioner_id,
+      </if>
+      <if test="customerId != null">
+        customer_id,
+      </if>
+      <if test="fyp != null">
+        FYP,
+      </if>
+      <if test="fyc != null">
+        FYC,
+      </if>
+      <if test="timeToClose != null">
+        time_to_close,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="assignedPractitionerId != null">
+        #{assignedPractitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="customerId != null">
+        #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="fyp != null">
+        #{fyp,jdbcType=DECIMAL},
+      </if>
+      <if test="fyc != null">
+        #{fyc,jdbcType=DECIMAL},
+      </if>
+      <if test="timeToClose != null">
+        #{timeToClose,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsAssigneds">
+    update ag_mkt_leads_assigneds
+    <set>
+      <if test="assignedPractitionerId != null">
+        assigned_practitioner_id = #{assignedPractitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="customerId != null">
+        customer_id = #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="fyp != null">
+        FYP = #{fyp,jdbcType=DECIMAL},
+      </if>
+      <if test="fyc != null">
+        FYC = #{fyc,jdbcType=DECIMAL},
+      </if>
+      <if test="timeToClose != null">
+        time_to_close = #{timeToClose,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>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.marketing.MktLeadsAssigneds">
+    update ag_mkt_leads_assigneds
+    set assigned_practitioner_id = #{assignedPractitionerId,jdbcType=BIGINT},
+      customer_id = #{customerId,jdbcType=BIGINT},
+      FYP = #{fyp,jdbcType=DECIMAL},
+      FYC = #{fyc,jdbcType=DECIMAL},
+      time_to_close = #{timeToClose,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}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="findByMktLeadsAssigneds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_mkt_leads_assigneds
+    <where>
+      <if test="id != null">
+        id = #{id}
+      </if>
+      <if test="assignedPractitionerId != null">
+        and assigned_practitioner_id = #{assignedPractitionerId,jdbcType=BIGINT}
+      </if>
+      <if test="customerId != null">
+        and customer_id = #{customerId,jdbcType=BIGINT}
+      </if>
+      <if test="fyp != null">
+        and FYP = #{fyp,jdbcType=DECIMAL}
+      </if>
+      <if test="fyc != null">
+        and  FYC = #{fyc,jdbcType=DECIMAL}
+      </if>
+      <if test="timeToClose != null">
+        and time_to_close = #{timeToClose,jdbcType=TIMESTAMP}
+      </if>
+      <if test="isActive != null">
+        and is_active = #{isActive,jdbcType=INTEGER}
+      </if>
+      <if test="createdAt != null">
+        and created_at = #{createdAt,jdbcType=TIMESTAMP}
+      </if>
+      <if test="createdBy != null">
+        and created_by = #{createdBy,jdbcType=BIGINT}
+      </if>
+      <if test="updatedAt != null">
+        and updated_at = #{updatedAt,jdbcType=TIMESTAMP}
+      </if>
+      <if test="updatedBy != null">
+        and updated_by = #{updatedBy,jdbcType=BIGINT}
+      </if>
+    </where>
+  </select>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/meta/MdMkCampaignMapper.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.MdMkCampaignMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.MdMkCampaign">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="reward" jdbcType="DECIMAL" property="reward" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="ui_display_count" jdbcType="INTEGER" property="uiDisplayCount" />
+    <result column="effective_start_date" jdbcType="DATE" property="effectiveStartDate" />
+    <result column="effective_end_date" jdbcType="DATE" property="effectiveEndDate" />
+    <result column="dept_id" jdbcType="BIGINT" property="deptId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, `name`, code, content, reward, is_active, ui_display_count, effective_start_date, 
+    effective_end_date, dept_id, created_at, created_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_md_mk_campaign
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_md_mk_campaign
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdMkCampaign" useGeneratedKeys="true">
+    insert into ag_md_mk_campaign (`name`, code, content, 
+      reward, is_active, ui_display_count, 
+      effective_start_date, effective_end_date, dept_id, 
+      created_at, created_by)
+    values (#{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, 
+      #{reward,jdbcType=DECIMAL}, #{isActive,jdbcType=INTEGER}, #{uiDisplayCount,jdbcType=INTEGER}, 
+      #{effectiveStartDate,jdbcType=DATE}, #{effectiveEndDate,jdbcType=DATE}, #{deptId,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdMkCampaign" useGeneratedKeys="true">
+    insert into ag_md_mk_campaign
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="reward != null">
+        reward,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="uiDisplayCount != null">
+        ui_display_count,
+      </if>
+      <if test="effectiveStartDate != null">
+        effective_start_date,
+      </if>
+      <if test="effectiveEndDate != null">
+        effective_end_date,
+      </if>
+      <if test="deptId != null">
+        dept_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="reward != null">
+        #{reward,jdbcType=DECIMAL},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="uiDisplayCount != null">
+        #{uiDisplayCount,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveStartDate != null">
+        #{effectiveStartDate,jdbcType=DATE},
+      </if>
+      <if test="effectiveEndDate != null">
+        #{effectiveEndDate,jdbcType=DATE},
+      </if>
+      <if test="deptId != null">
+        #{deptId,jdbcType=BIGINT},
+      </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.MdMkCampaign">
+    update ag_md_mk_campaign
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="reward != null">
+        reward = #{reward,jdbcType=DECIMAL},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="uiDisplayCount != null">
+        ui_display_count = #{uiDisplayCount,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveStartDate != null">
+        effective_start_date = #{effectiveStartDate,jdbcType=DATE},
+      </if>
+      <if test="effectiveEndDate != null">
+        effective_end_date = #{effectiveEndDate,jdbcType=DATE},
+      </if>
+      <if test="deptId != null">
+        dept_id = #{deptId,jdbcType=BIGINT},
+      </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.MdMkCampaign">
+    update ag_md_mk_campaign
+    set `name` = #{name,jdbcType=VARCHAR},
+      code = #{code,jdbcType=VARCHAR},
+      content = #{content,jdbcType=VARCHAR},
+      reward = #{reward,jdbcType=DECIMAL},
+      is_active = #{isActive,jdbcType=INTEGER},
+      ui_display_count = #{uiDisplayCount,jdbcType=INTEGER},
+      effective_start_date = #{effectiveStartDate,jdbcType=DATE},
+      effective_end_date = #{effectiveEndDate,jdbcType=DATE},
+      dept_id = #{deptId,jdbcType=BIGINT},
+      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/MdTagMapper.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.MdTagMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.MdTag">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="tag_type" jdbcType="BIGINT" property="tagType" />
+    <result column="tag_name" jdbcType="VARCHAR" property="tagName" />
+    <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" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, tag_type, tag_name, is_active, created_at, created_by, updated_at, updated_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_md_tag
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_md_tag
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdTag" useGeneratedKeys="true">
+    insert into ag_md_tag (tag_type, tag_name, is_active, 
+      created_at, created_by, updated_at, 
+      updated_by)
+    values (#{tagType,jdbcType=BIGINT}, #{tagName,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdTag" useGeneratedKeys="true">
+    insert into ag_md_tag
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="tagType != null">
+        tag_type,
+      </if>
+      <if test="tagName != null">
+        tag_name,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="tagType != null">
+        #{tagType,jdbcType=BIGINT},
+      </if>
+      <if test="tagName != null">
+        #{tagName,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>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.meta.MdTag">
+    update ag_md_tag
+    <set>
+      <if test="tagType != null">
+        tag_type = #{tagType,jdbcType=BIGINT},
+      </if>
+      <if test="tagName != null">
+        tag_name = #{tagName,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>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.meta.MdTag">
+    update ag_md_tag
+    set tag_type = #{tagType,jdbcType=BIGINT},
+      tag_name = #{tagName,jdbcType=VARCHAR},
+      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}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+    <select id="findByTagIdIn" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from ag_md_tag
+      <where>
+        <choose>
+          <when test="tagIds != null and tagIds.size() > 0">
+            id in
+            <foreach item="item" collection="tagIds" separator="," open="(" close=")"  index="index">
+              #{item}
+            </foreach>
+          </when>
+          <otherwise>
+             1 = 2
+          </otherwise>
+        </choose>
+      </where>
+    </select>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/meta/ObjectCollectionTaggedMapper.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.ObjectCollectionTaggedMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.meta.ObjectCollectionTagged">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="md_tag_id" jdbcType="INTEGER" property="mdTagId" />
+    <result column="tagged_object_type" jdbcType="INTEGER" property="taggedObjectType" />
+    <result column="tagged_object_id" jdbcType="BIGINT" property="taggedObjectId" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="recommend_order" jdbcType="INTEGER" property="recommendOrder" />
+    <result column="display_order" jdbcType="INTEGER" property="displayOrder" />
+    <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" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, md_tag_id, tagged_object_type, tagged_object_id, is_active, recommend_order, 
+    display_order, created_at, created_by, updated_at, updated_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_object_collection_tagged
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_object_collection_tagged
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.ObjectCollectionTagged" useGeneratedKeys="true">
+    insert into ag_object_collection_tagged (md_tag_id, tagged_object_type, tagged_object_id, 
+      is_active, recommend_order, display_order, 
+      created_at, created_by, updated_at, 
+      updated_by)
+    values (#{mdTagId,jdbcType=INTEGER}, #{taggedObjectType,jdbcType=INTEGER}, #{taggedObjectId,jdbcType=BIGINT}, 
+      #{isActive,jdbcType=INTEGER}, #{recommendOrder,jdbcType=INTEGER}, #{displayOrder,jdbcType=INTEGER}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.ObjectCollectionTagged" useGeneratedKeys="true">
+    insert into ag_object_collection_tagged
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="mdTagId != null">
+        md_tag_id,
+      </if>
+      <if test="taggedObjectType != null">
+        tagged_object_type,
+      </if>
+      <if test="taggedObjectId != null">
+        tagged_object_id,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="recommendOrder != null">
+        recommend_order,
+      </if>
+      <if test="displayOrder != null">
+        display_order,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="mdTagId != null">
+        #{mdTagId,jdbcType=INTEGER},
+      </if>
+      <if test="taggedObjectType != null">
+        #{taggedObjectType,jdbcType=INTEGER},
+      </if>
+      <if test="taggedObjectId != null">
+        #{taggedObjectId,jdbcType=BIGINT},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="recommendOrder != null">
+        #{recommendOrder,jdbcType=INTEGER},
+      </if>
+      <if test="displayOrder != null">
+        #{displayOrder,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.meta.ObjectCollectionTagged">
+    update ag_object_collection_tagged
+    <set>
+      <if test="mdTagId != null">
+        md_tag_id = #{mdTagId,jdbcType=INTEGER},
+      </if>
+      <if test="taggedObjectType != null">
+        tagged_object_type = #{taggedObjectType,jdbcType=INTEGER},
+      </if>
+      <if test="taggedObjectId != null">
+        tagged_object_id = #{taggedObjectId,jdbcType=BIGINT},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="recommendOrder != null">
+        recommend_order = #{recommendOrder,jdbcType=INTEGER},
+      </if>
+      <if test="displayOrder != null">
+        display_order = #{displayOrder,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>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.meta.ObjectCollectionTagged">
+    update ag_object_collection_tagged
+    set md_tag_id = #{mdTagId,jdbcType=INTEGER},
+      tagged_object_type = #{taggedObjectType,jdbcType=INTEGER},
+      tagged_object_id = #{taggedObjectId,jdbcType=BIGINT},
+      is_active = #{isActive,jdbcType=INTEGER},
+      recommend_order = #{recommendOrder,jdbcType=INTEGER},
+      display_order = #{displayOrder,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+    <select id="findByObjectCollectionTagged" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from ag_object_collection_tagged
+      <where>
+        <if test="id != null">
+          id = #{id}
+        </if>
+        <if test="mdTagId != null">
+          and md_tag_id = #{mdTagId,jdbcType=INTEGER}
+        </if>
+        <if test="taggedObjectType != null">
+          and tagged_object_type = #{taggedObjectType,jdbcType=INTEGER}
+        </if>
+        <if test="taggedObjectId != null">
+          and tagged_object_id = #{taggedObjectId,jdbcType=BIGINT}
+        </if>
+        <if test="isActive != null">
+          and is_active = #{isActive,jdbcType=INTEGER}
+        </if>
+        <if test="recommendOrder != null">
+          and recommend_order = #{recommendOrder,jdbcType=INTEGER}
+        </if>
+        <if test="displayOrder != null">
+          and display_order = #{displayOrder,jdbcType=INTEGER}
+        </if>
+        <if test="createdAt != null">
+          and  created_at = #{createdAt,jdbcType=TIMESTAMP}
+        </if>
+        <if test="createdBy != null">
+          and created_by = #{createdBy,jdbcType=BIGINT}
+        </if>
+        <if test="updatedAt != null">
+          and updated_at = #{updatedAt,jdbcType=TIMESTAMP}
+        </if>
+        <if test="updatedBy != null">
+          and updated_by = #{updatedBy,jdbcType=BIGINT}
+        </if>
+      </where>
+    </select>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/opportunity/OpportunityMapper.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.opportunity.OpportunityMapper">
-    <resultMap id="opportunityQuery" type="com.yd.dal.entity.opportunity.OwnOpportunityInfo">
-        <result column="opportunityId" property="opportunityId"/>
-        <result column="name" property="name"/>
-        <result column="mobileNo" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
-        <result column="opportunityFrom" property="opportunityFrom"/>
-        <result column="opportunityDate" property="opportunityDate"/>
-        <result column="mdDropOptionId" property="mdDropOptionId"/>
-        <result column="leadsAssignedId" property="leadsAssignedId"/>
-    </resultMap>
-    <select id="ownOpportunityQuery" resultMap="opportunityQuery">
-			SELECT
-                a.customer_id opportunityId,
-                c.NAME name,
-                c.mobile_no mobileNo,
-                p.mkt_campaign opportunityFrom,
-                date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
-                if (p.mkt_campaign is null ,'',(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign )) mdDropOptionId,
-                a.id leadsAssignedId
-             FROM
-                ag_mkt_leads_assigneds a
-                LEFT JOIN ag_mkt_leads_pool p ON p.customer_id = a.customer_id
-                LEFT JOIN ag_acl_customer c ON c.id = a.customer_id
-             where a.is_active=1
-             <if test="practitionerId != null">
-                 and a.assigned_practitioner_id = #{practitionerId}
-             </if>
-    </select>
-</mapper>

yd-api/src/main/resources/mapper/practitioner/PractitionerMapper.xml

@@ -175,6 +175,34 @@
         where c.login = #{mobileNo};
     </select>
 
+
+    <resultMap id="opportunityQuery" type="com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo">
+        <result column="opportunityId" property="opportunityId"/>
+        <result column="name" property="name"/>
+        <result column="mobileNo" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
+        <result column="opportunityFrom" property="opportunityFrom"/>
+        <result column="opportunityDate" property="opportunityDate"/>
+        <result column="mdDropOptionId" property="mdDropOptionId"/>
+        <result column="leadsAssignedId" property="leadsAssignedId"/>
+    </resultMap>
+    <select id="ownOpportunityQuery" resultMap="opportunityQuery">
+        SELECT
+        a.customer_id opportunityId,
+        c.NAME name,
+        c.mobile_no mobileNo,
+        p.mkt_campaign opportunityFrom,
+        date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
+        if (p.mkt_campaign is null ,'',(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign )) mdDropOptionId,
+        a.id leadsAssignedId
+        FROM
+        ag_mkt_leads_assigneds a
+        LEFT JOIN ag_mkt_leads_pool p ON p.customer_id = a.customer_id
+        LEFT JOIN ag_acl_customer c ON c.id = a.customer_id
+        where a.is_active=1
+        <if test="practitionerId != null">
+            and a.assigned_practitioner_id = #{practitionerId}
+        </if>
+    </select>
 </mapper>