日程修改删除同步商机和增员

c6890591 · jianan · d9c23c2c · c6890591 · c6890591 · c6890591
Commit c6890591 authored Sep 21, 2020 by jianan
12 changed files
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java
 package com.yd.api.practitioner.service.impl;
-import com.yd.api.customer.service.CustomerService;
 import com.yd.api.practitioner.service.ScheduleTrackService;
 import com.yd.api.practitioner.vo.sechedule.*;
 import com.yd.api.result.CommonResult;
@@ -36,8 +35,6 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
    private MdDropOptionsDALService mdDropOptionsDALService;
    @Autowired
    private MktLeadsAssignedTrackDALService mktLeadsAssignedTrackDALService;
-    @Autowired
-    private CustomerService customerService;
    @Override
    public AddScheduleTrackResponseVO insert(AddScheduleTrackRequestVO requestVO) {
@@ -73,9 +70,25 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
            Date curTime = new Date();
            schedule.setUpdatedAt(new Date());
            schedule.setCreatedAt(curTime);
+            // id不为空即修改-先删除旧的
+            Long id = requestVO.getId();
+            Integer taskType = requestVO.getTaskType();
+            if (!CommonUtil.isNullOrZero(id)) {
+                // 根据id删除日程表记录
+                scheduleTrackMapper.deleteScheduleTrackById(id);
+                if (Integer.valueOf(1).equals(taskType)) {
+                    // 根据id删除商机表记录
+                    mktLeadsAssignedTrackDALService.deleteScheduleTrackById(id);
+                }
+                if (Integer.valueOf(2).equals(taskType)) {
+                    // 根据id删除增员记录
+                    aclPractitionerPotentialAssignedTrackDALService.deleteScheduleTrackById(id);
+                }
+                // id置空
+                schedule.setId(null);
+            }
            scheduleTrackMapper.insert(schedule);
            // 营销日程同步插入到商机活动跟踪表，增员日程同步插入到增援活动跟踪表
-            Integer taskType = schedule.getTaskType();
            Long referLeadsId = schedule.getReferLeadsId();
            Long referPotentialId = schedule.getReferPotentialId();
            if (1 == taskType && null != referLeadsId) {
@@ -98,6 +111,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
        track.setLeadsAssignedId(schedule.getReferLeadsId());
        track.setSalesNotice(schedule.getNotice());
+        track.setScheduleTaskTrackingId(schedule.getId());
        List<MktLeadsAssignedTrack> trackList = mktLeadsAssignedTrackDALService.findByTrackTimeForNew(track);
        if (trackList.isEmpty()){
            //保存
@@ -374,9 +388,18 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
    public DeleteScheduleByIdResponseVO deleteScheduleTrackById(DeleteScheduleTrackByIdRequestVO requestVO) {
        DeleteScheduleByIdResponseVO resp = new DeleteScheduleByIdResponseVO();
        Long scheduleTrackId = requestVO.getScheduleTrackId();
+        Integer taskType = requestVO.getTaskType();
        try {
-            // 根据id删除记录
+            // 根据id删除日程表记录
            scheduleTrackMapper.deleteScheduleTrackById(scheduleTrackId);
+            if (Integer.valueOf(1).equals(taskType)) {
+                // 根据id删除商机表记录
+                mktLeadsAssignedTrackDALService.deleteScheduleTrackById(scheduleTrackId);
+            }
+            if (Integer.valueOf(2).equals(taskType)) {
+                // 根据id删除增员记录
+                aclPractitionerPotentialAssignedTrackDALService.deleteScheduleTrackById(scheduleTrackId);
+            }
            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
        } catch (Exception e) {

--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/DeleteScheduleTrackByIdRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/DeleteScheduleTrackByIdRequestVO.java
@@ -5,4 +5,6 @@ import lombok.Data;
 @Data
 public class DeleteScheduleTrackByIdRequestVO {
    private Long scheduleTrackId;
+    private Integer taskType;
 }
--- a/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerPotentialAssignedTrack.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerPotentialAssignedTrack.java
@@ -70,5 +70,10 @@ public class AclPractitionerPotentialAssignedTrack implements Serializable {
    private Date trackTime;
+    /**
+     * 关联ag_mkt_schedule_task_tracking.id 日程表
+     */
+    private Long scheduleTaskTrackingId;
    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsAssignedTrack.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsAssignedTrack.java
@@ -92,5 +92,10 @@ public class MktLeadsAssignedTrack implements Serializable {
    private Date trackTime;
+    /**
+     * 关联ag_mkt_schedule_task_tracking.id 日程表
+     */
+    private Long scheduleTaskTrackingId;
    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.java
@@ -30,4 +30,6 @@ public interface AclPractitionerPotentialAssignedTrackMapper {
    List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(@Param("practitionerId")Long practitionerId, @Param("potentialId")Long potentialId);
    List<AclPractitionerPotentialAssignedTrack> findScoreByPractitionerIdAndDate(@Param("practitionerId")Long practitionerId, @Param("time")String time);
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsAssignedTrackMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsAssignedTrackMapper.java
@@ -31,4 +31,6 @@ public interface MktLeadsAssignedTrackMapper {
    MktLeadsAssignedTrack findByListNotesForCustomerId(Long customerId);
    List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("time") String time);
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialAssignedTrackDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialAssignedTrackDALService.java
@@ -24,4 +24,6 @@ public interface AclPractitionerPotentialAssignedTrackDALService {
    List<AclPractitionerPotentialAssignedTrack> findScoreByPractitionerIdAndDate(Long practitionerId, String time);
    void update(AclPractitionerPotentialAssignedTrack assignedTrack);
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialAssignedTrackDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialAssignedTrackDALServiceImpl.java
@@ -55,4 +55,9 @@ public class AclPractitionerPotentialAssignedTrackDALServiceImpl implements AclP
    public void update(AclPractitionerPotentialAssignedTrack assignedTrack) {
        aclPractitionerPotentialAssignedTrackMapper.updateByPrimaryKeySelective(assignedTrack);
    }
+    @Override
+    public void deleteScheduleTrackById(Long scheduleTrackId) {
+        aclPractitionerPotentialAssignedTrackMapper.deleteScheduleTrackById(scheduleTrackId);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsAssignedTrackDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsAssignedTrackDALServiceImpl.java
@@ -55,4 +55,9 @@ public class MktLeadsAssignedTrackDALServiceImpl implements MktLeadsAssignedTrac
    public List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(Long practitionerId, String time) {
        return mktLeadsAssignedTrackMapper.getSalesScoreDetailByPractitionerId(practitionerId, time);
    }
+    @Override
+    public void deleteScheduleTrackById(Long scheduleTrackId) {
+        mktLeadsAssignedTrackMapper.deleteScheduleTrackById(scheduleTrackId);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsAssignedTrackDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsAssignedTrackDALService.java
@@ -32,4 +32,6 @@ public interface MktLeadsAssignedTrackDALService {
     * @return 跟进状态详情
     */
    List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(Long practitionerId, String time);
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.xml
@@ -115,6 +115,9 @@
      <if test="trackTime != null">
        track_time,
      </if>
+      <if test="scheduleTaskTrackingId != null">
+        schedule_task_tracking_id,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="practitionerPotentialId != null">
@@ -159,6 +162,9 @@
      <if test="trackTime != null">
        #{trackTime,jdbcType=TIMESTAMP},
      </if>
+      <if test="scheduleTaskTrackingId != null">
+        #{scheduleTaskTrackingId,jdbcType=BIGINT},
+      </if>
    </trim>
  </insert>
  <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="true" >
@@ -325,4 +331,9 @@
      </choose>
    </select>
+  <delete id="deleteScheduleTrackById" parameterType="java.lang.Long">
+    delete from ag_acl_practitioner_potential_assigned_track
+    where schedule_task_tracking_id = #{scheduleTrackId,jdbcType=BIGINT}
+  </delete>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/marketing/MktLeadsAssignedTrackMapper.xml
+++ b/yd-api/src/main/resources/mapper/marketing/MktLeadsAssignedTrackMapper.xml
@@ -101,6 +101,9 @@
      <if test="trackTime != null">
        track_time,
      </if>
+      <if test="scheduleTaskTrackingId != null">
+        schedule_task_tracking_id,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="orderId != null">
@@ -151,6 +154,9 @@
      <if test="trackTime != null">
        #{trackTime,jdbcType=TIMESTAMP},
      </if>
+      <if test="scheduleTaskTrackingId != null">
+        #{scheduleTaskTrackingId,jdbcType=BIGINT},
+      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsAssignedTrack">
@@ -372,4 +378,9 @@
        group by t.md_drop_option_id,o.drop_option_order
        ORDER BY o.drop_option_order
  </select>
+  <delete id="deleteScheduleTrackById" parameterType="java.lang.Long">
+    delete from ag_mkt_leads_assigned_track
+    where schedule_task_tracking_id = #{scheduleTrackId,jdbcType=BIGINT}
+  </delete>
 </mapper>
\ No newline at end of file