客户告知书10

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

@@ -3654,6 +3654,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
 
 
             // 商机更新一条告知书待签署的记录
             // 商机更新一条告知书待签署的记录
             MktLeadsAssignedTrack track = new MktLeadsAssignedTrack();
             MktLeadsAssignedTrack track = new MktLeadsAssignedTrack();
+            track.setPractitionerId(requestVO.getPractitionerId());
             track.setCustomerId(newerCustomer.getId());// 商机的id还是得用旧的customerId
             track.setCustomerId(newerCustomer.getId());// 商机的id还是得用旧的customerId
             track.setLeadsAssignedId(requestVO.getLeadsAssignedId());
             track.setLeadsAssignedId(requestVO.getLeadsAssignedId());
             track.setTrackTime(curDate);
             track.setTrackTime(curDate);

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

@@ -47,6 +47,7 @@ public class AgPoInformed implements Serializable {
      * practitioner_id
      * practitioner_id
      */
      */
     private Long practitionerId;
     private Long practitionerId;
+    private String practitionerName;
 
 
     /**
     /**
      * 保单号
      * 保单号
@@ -326,4 +327,12 @@ public class AgPoInformed implements Serializable {
     public void setSignOssPath(String signOssPath) {
     public void setSignOssPath(String signOssPath) {
         this.signOssPath = signOssPath;
         this.signOssPath = signOssPath;
     }
     }
+
+    public String getPractitionerName() {
+        return practitionerName;
+    }
+
+    public void setPractitionerName(String practitionerName) {
+        this.practitionerName = practitionerName;
+    }
 }
 }
\ No newline at end of file

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

@@ -1404,7 +1404,7 @@
     SELECT
     SELECT
     a.customer_id opportunityId,
     a.customer_id opportunityId,
     IFNULL(a.customer_name,c.NAME) name,
     IFNULL(a.customer_name,c.NAME) name,
-    IFNULL(a.customer_mobile,c.mobile_no) mobileNo,
+    IFNULL(c.mobile_no,a.customer_mobile) mobileNo,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
     if (p.source_from = 0 ,(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign ),(SELECT md.drop_option_name from ag_md_drop_options md where p.source_from = md.id )) opportunityFrom,
     if (p.source_from = 0 ,(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign ),(SELECT md.drop_option_name from ag_md_drop_options md where p.source_from = md.id )) opportunityFrom,
     a.id leadsAssignedId ,
     a.id leadsAssignedId ,

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

@@ -10,6 +10,7 @@
     <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
     <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
     <result column="customer_mobile" jdbcType="VARCHAR" property="customerMobile" />
     <result column="customer_mobile" jdbcType="VARCHAR" property="customerMobile" />
     <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
     <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
+    <result column="practitioner_name" jdbcType="VARCHAR" property="practitionerName" />
     <result column="policy_no" jdbcType="VARCHAR" property="policyNo" />
     <result column="policy_no" jdbcType="VARCHAR" property="policyNo" />
     <result column="sign_date" jdbcType="VARCHAR" property="signDate" />
     <result column="sign_date" jdbcType="VARCHAR" property="signDate" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="status" jdbcType="VARCHAR" property="status" />
@@ -231,23 +232,24 @@
   </update>
   </update>
   <select id="selectByRecord" parameterType="com.yd.dal.entity.customer.AgPoInformed" resultMap="BaseResultMap">
   <select id="selectByRecord" parameterType="com.yd.dal.entity.customer.AgPoInformed" resultMap="BaseResultMap">
     select
     select
-    <include refid="Base_Column_List" />
-    from ag_po_informed
+    p.name practitioner_name,
+    t.*
+    from ag_po_informed t left join ag_acl_practitioner p on t.practitioner_id = p.id
     where 1=1
     where 1=1
     <if test="customerName != null">
     <if test="customerName != null">
-      and customer_name = #{customerName,jdbcType=VARCHAR}
+      and t.customer_name = #{customerName,jdbcType=VARCHAR}
     </if>
     </if>
     <if test="customerMobile != null">
     <if test="customerMobile != null">
-      and customer_mobile = #{customerMobile,jdbcType=VARCHAR}
+      and t.customer_mobile = #{customerMobile,jdbcType=VARCHAR}
     </if>
     </if>
     <if test="practitionerId != null">
     <if test="practitionerId != null">
-      and practitioner_id = #{practitionerId,jdbcType=BIGINT}
+      and t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
     </if>
     </if>
     <if test="policyNo != null">
     <if test="policyNo != null">
-      and policy_no = #{policyNo,jdbcType=VARCHAR}
+      and t.policy_no = #{policyNo,jdbcType=VARCHAR}
     </if>
     </if>
     <if test="signDate != null">
     <if test="signDate != null">
-      and sign_date = #{signDate,jdbcType=VARCHAR}
+      and t.sign_date = #{signDate,jdbcType=VARCHAR}
     </if>
     </if>
   </select>
   </select>
   <select id="getNextInformedNo" resultType="java.lang.String" statementType="CALLABLE">
   <select id="getNextInformedNo" resultType="java.lang.String" statementType="CALLABLE">

yd-api/src/main/resources/mapper/marketing/MktLeadsAssignedsMapper.xml

@@ -13,7 +13,7 @@
     <result column="pieces" jdbcType="INTEGER" property="pieces" />
     <result column="pieces" jdbcType="INTEGER" property="pieces" />
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
     <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
     <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
-    <result column="customer_mobile" jdbcType="VARCHAR" property="customerMobile" />
+    <result column="customer_mobile" jdbcType="VARCHAR" property="customerMobile" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -174,7 +174,7 @@
         customer_name = #{customerName,jdbcType=VARCHAR},
         customer_name = #{customerName,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="customerMobile != null">
       <if test="customerMobile != null">
-        customer_mobile = #{customerMobile,jdbcType=VARCHAR},
+        customer_mobile = #{customerMobile,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
       </if>
       </if>
     </set>
     </set>
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}