客户告知书17

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

@@ -1081,6 +1081,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             OpportunityRecordInfo info = new OpportunityRecordInfo();
             CommonUtil.simpleObjectCopy(track, info);
             info.setOpportunityId(track.getCustomerId());
+            info.setStatus(track.getInformedStatus());
             info.setNoticeDate(CommonUtil.dateParseString(track.getTrackTime(), "yyyy-MM-dd"));
             BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("id", track.getMdDropOptionId());
             List<MdDropOptions> select = (List<MdDropOptions>)CollectionUtils.select(dropOptionsList, predicate);
@@ -3661,6 +3662,8 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             track.setPractitionerId(requestVO.getPractitionerId());
             track.setCustomerId(newerCustomer.getId());// 商机的id还是得用旧的customerId
             track.setLeadsAssignedId(requestVO.getLeadsAssignedId());
+            track.setInformedStatus("0");
+            track.setInformedOssPath("https://yindun-images.oss-cn-shanghai-finance-1-pub.aliyuncs.com/ElectronicNotice/ElectronicNotice.pdf");
             track.setTrackTime(curDate);
             track.setCreatedBy(loginId);
             track.setCreatedAt(new Date());
@@ -3776,6 +3779,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             track.setPractitionerId(informed.getPractitionerId());
             track.setLeadsAssignedId(informed.getLeadsId());
             track.setInformedId(id);
+            track.setInformedStatus("1");
             track.setCustomerId(informed.getCustomerId());
             track.setTrackTime(curDate);
             track.setCreatedBy(-1L);

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

@@ -21,4 +21,8 @@ public class OpportunityRecordInfo {
      * 告知书url
      */
     private String informedOssPath;
+    /**
+     * 告知书签署状态
+     */
+    private String status;
 }

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

@@ -105,6 +105,10 @@ public class MktLeadsAssignedTrack implements Serializable {
      * 告知书url
      */
     private String informedOssPath;
+    /**
+     * 告知书签署状态
+     */
+    private String informedStatus;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -21,11 +21,12 @@
     <result column="track_time" jdbcType="TIMESTAMP" property="trackTime" />
     <result column="informed_oss_path" jdbcType="VARCHAR" property="informedOssPath" />
     <result column="informed_id" jdbcType="BIGINT" property="informedId" />
+    <result column="informed_status" jdbcType="VARCHAR" property="informedStatus" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_id, order_no, sales_notice, is_active, created_at, created_by, creator_type,
     updated_at, updated_by, updator_type, practitioner_id, customer_id, md_drop_option_id,
-    track_score, leads_assigned_id,track_time,informed_oss_path,informed_id
+    track_score, leads_assigned_id,track_time,informed_oss_path,informed_id,informed_status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -218,6 +219,15 @@
       <if test="trackTime != null">
         track_time = #{trackTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="informedStatus != null">
+        informed_status = #{informedStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="informedOssPath != null">
+        informed_oss_path = #{informedOssPath,jdbcType=VARCHAR},
+      </if>
+      <if test="informedId != null">
+        leads_assigned_id = #{informedId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -394,7 +404,7 @@
   <update id="updateInformedOssPathByInformedId">
     update ag_mkt_leads_assigned_track
     set informed_oss_path = #{informedOssPath,jdbcType=VARCHAR}
-    where informed_id = #{informedId,jdbcType=BIGINT}
+    where informed_id = #{informedId,jdbcType=BIGINT} and informed_status = #{informedStatus,jdbcType=VARCHAR}
   </update>
   <update id="updateCustomerIdByLeadsAssignedId">
     update ag_mkt_leads_assigned_track