日程列表查询加姓名电话

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

@@ -99,7 +99,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
             if (2 == taskType && null != referPotentialId) {
             if (2 == taskType && null != referPotentialId) {
                 this.insertPotentialAssignedTrack(schedule);
                 this.insertPotentialAssignedTrack(schedule);
             }
             }
-            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+            resp.setCommonResult(new CommonResult(true, "任务添加成功"));
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             resp.setCommonResult(new CommonResult(false, e.getMessage()));
             resp.setCommonResult(new CommonResult(false, e.getMessage()));

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/ScheduleTrackVO.java

@@ -26,18 +26,9 @@ public class ScheduleTrackVO {
     private Long customerId;
     private Long customerId;
     private Long mdDropOptionId;
     private Long mdDropOptionId;
     private String mdDropOptionName;
     private String mdDropOptionName;
+    private String name;
+    private String mobileNo;
     private Integer trackScore;
     private Integer trackScore;
-
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date trackTime;
     private Date trackTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createdAt;
-    private Long createdBy;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updatedAt;
-    private Long updatedBy;
-    private Integer creatorType;
-    private Integer updatorType;
 }
 }

yd-api/src/main/java/com/yd/dal/entity/practitioner/ScheduleTrack.java

@@ -42,4 +42,6 @@ public class ScheduleTrack {
     private Long updatedBy;
     private Long updatedBy;
     private Integer creatorType;
     private Integer creatorType;
     private Integer updatorType;
     private Integer updatorType;
+    private String name;
+    private String mobileNo;
 }
 }

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

@@ -29,16 +29,18 @@
         <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
         <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
         <result column="updator_type" jdbcType="INTEGER" property="updatorType"/>
         <result column="updator_type" jdbcType="INTEGER" property="updatorType"/>
         <result column="creator_type" jdbcType="INTEGER" property="creatorType"/>
         <result column="creator_type" jdbcType="INTEGER" property="creatorType"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="mobile_no" jdbcType="VARCHAR" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
     </resultMap>
     </resultMap>
     <select id="queryScheduleTrackList" resultMap="ScheduleTrackResultMap">
     <select id="queryScheduleTrackList" resultMap="ScheduleTrackResultMap">
-        SELECT id, notice, task_type, refer_leads_id, refer_potential_id,
+        SELECT t.id, notice, task_type, refer_leads_id, refer_potential_id,
             task_important_tag, task_routine_at_week7,task_routine_at_week6, task_routine_at_week5,
             task_important_tag, task_routine_at_week7,task_routine_at_week6, task_routine_at_week5,
             task_routine_at_week4, task_routine_at_week3, task_routine_at_week2, task_routine_at_week1,
             task_routine_at_week4, task_routine_at_week3, task_routine_at_week2, task_routine_at_week1,
             DATE_FORMAT(task_time_from,'%H:%i') task_time_from, DATE_FORMAT(task_time_end,'%H:%i') task_time_end,
             DATE_FORMAT(task_time_from,'%H:%i') task_time_from, DATE_FORMAT(task_time_end,'%H:%i') task_time_end,
-            is_active, practitioner_id, customer_id, md_drop_option_id, track_score, track_time,
-            created_at, created_by, updated_at, updated_by, updator_type, creator_type
-        FROM
-            ag_mkt_schedule_task_tracking t
+            practitioner_id, customer_id, md_drop_option_id, track_score, track_time,
+            c.name, c.mobile_no
+        FROM ag_mkt_schedule_task_tracking t
+          LEFT JOIN ag_acl_customer c on t.customer_id=c.id
         WHERE practitioner_id = #{practitionerId,jdbcType=BIGINT}
         WHERE practitioner_id = #{practitionerId,jdbcType=BIGINT}
         ORDER BY task_time_from
         ORDER BY task_time_from
     </select>
     </select>
@@ -225,7 +227,12 @@
             created_at, created_by, updated_at, updated_by, updator_type, creator_type
             created_at, created_by, updated_at, updated_by, updator_type, creator_type
             from ag_mkt_schedule_task_tracking t
             from ag_mkt_schedule_task_tracking t
         where t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
         where t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
-            and md_drop_option_id in (223,224,225,226,227)
+            and md_drop_option_id in
+            (SELECT o.id
+                FROM ag_md_drop_options o
+                LEFT JOIN ag_md_drop_master m ON m.id = o.drop_master_id
+                WHERE m.scenario_code = ''
+            )
     </select>
     </select>
 
 
     <delete id="deleteScheduleTrackById">
     <delete id="deleteScheduleTrackById">