日程列表查询修改时间段格式

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

@@ -94,14 +94,17 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
 
     private void insertOpportunityRecord(ScheduleTrack schedule) {
     private void insertOpportunityRecord(ScheduleTrack schedule) {
         MktLeadsAssignedTrack track = new MktLeadsAssignedTrack();
         MktLeadsAssignedTrack track = new MktLeadsAssignedTrack();
-        CommonUtil.simpleObjectCopy(schedule, track);
+        BeanUtils.copyProperties(schedule, track, "id");
 
 
         track.setLeadsAssignedId(schedule.getReferLeadsId());
         track.setLeadsAssignedId(schedule.getReferLeadsId());
         track.setSalesNotice(schedule.getNotice());
         track.setSalesNotice(schedule.getNotice());
         List<MktLeadsAssignedTrack> trackList = mktLeadsAssignedTrackDALService.findByTrackTimeForNew(track);
         List<MktLeadsAssignedTrack> trackList = mktLeadsAssignedTrackDALService.findByTrackTimeForNew(track);
-        if (!trackList.isEmpty()){
+        if (trackList.isEmpty()){
             //保存
             //保存
             mktLeadsAssignedTrackDALService.saveTrack(track);
             mktLeadsAssignedTrackDALService.saveTrack(track);
+        } else {
+            //更新
+            mktLeadsAssignedTrackDALService.updateTrack(track);
         }
         }
 
 
     }
     }
@@ -114,7 +117,19 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         Date trackTimeDate = schedule.getTrackTime();
         Date trackTimeDate = schedule.getTrackTime();
 
 
         AclPractitionerPotentialAssignedTrack assignedTrack = new AclPractitionerPotentialAssignedTrack();
         AclPractitionerPotentialAssignedTrack assignedTrack = new AclPractitionerPotentialAssignedTrack();
-
+        List<AclPractitionerPotentialAssignedTrack> assignedTrackIsLastedList = aclPractitionerPotentialAssignedTrackDALService.findByPotentialIdAndIsLasted(potentialId,1);
+        //1、更新最新的状态
+        if(assignedTrackIsLastedList != null && !assignedTrackIsLastedList.isEmpty()){
+            List<AclPractitionerPotentialAssignedTrack> assignedTrackUpdateList = new ArrayList<>();
+            for(AclPractitionerPotentialAssignedTrack item : assignedTrackIsLastedList){
+                item.setIsLasted(0);
+                item.setUpdatedBy(practitionerId);
+                item.setUpdaterType(2);
+                item.setUpdatedAt(new Date());
+                assignedTrackUpdateList.add(item);
+            }
+            aclPractitionerPotentialAssignedTrackDALService.updateAll(assignedTrackUpdateList);
+        }
         //2、查询团队长对该增员所有增员状态
         //2、查询团队长对该增员所有增员状态
         List<AclPractitionerPotentialAssignedTrack> assignedTrackList = aclPractitionerPotentialAssignedTrackDALService.findByPractitionerIdAndPotentialIdAndTrackStatusId(practitionerId,potentialId,trackStatusId,trackTimeDate);
         List<AclPractitionerPotentialAssignedTrack> assignedTrackList = aclPractitionerPotentialAssignedTrackDALService.findByPractitionerIdAndPotentialIdAndTrackStatusId(practitionerId,potentialId,trackStatusId,trackTimeDate);
         if (assignedTrackList == null || assignedTrackList.isEmpty()) {//3、如果没有，获取增员状态对应的分值，
         if (assignedTrackList == null || assignedTrackList.isEmpty()) {//3、如果没有，获取增员状态对应的分值，

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

@@ -7,6 +7,7 @@ import java.util.Date;
 
 
 @Data
 @Data
 public class AddScheduleTrackRequestVO {
 public class AddScheduleTrackRequestVO {
+    private Long id;
     private Long practitionerId;
     private Long practitionerId;
     private String notice;
     private String notice;
     private Integer taskType;
     private Integer taskType;

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

@@ -24,10 +24,11 @@ public class ScheduleTrackVO {
     private Integer taskRoutineAtweek2;
     private Integer taskRoutineAtweek2;
     private Integer taskRoutineAtweek1;
     private Integer taskRoutineAtweek1;
     private Long customerId;
     private Long customerId;
+    private Long mdDropOptionId;
     private String mdDropOptionName;
     private String mdDropOptionName;
     private Integer trackScore;
     private Integer trackScore;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date trackTime;
     private Date trackTime;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -34,7 +34,8 @@
         SELECT id, notice, task_type, refer_leads_id, refer_potential_id,
         SELECT 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,
-            task_time_from, task_time_end, is_active, practitioner_id, customer_id, md_drop_option_id, track_score, track_time,
+            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
             created_at, created_by, updated_at, updated_by, updator_type, creator_type
         FROM
         FROM
             ag_mkt_schedule_task_tracking t
             ag_mkt_schedule_task_tracking t