日程365天bug

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

@@ -277,7 +277,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
             // 其他活动有长期固定，通过计算时间段内展示次数，算得总分
             // 先获得每个人所有的其他活动
-            List<PersonalSchedule> personalScheduleList = scheduleTrackMapper.queryPersonalScheduleList(practitionerIdList);
+            List<PersonalSchedule> personalScheduleList = scheduleTrackMapper.queryPersonalScheduleList(practitionerIdList, today);
 
             // 根据活动算本日，本周，本月的分数
             this.computeOtherScore(personalScheduleList, today, weekOne, monthOne);
@@ -340,7 +340,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         }
         try {
             // 根据经纪人id查询个人所有日程
-            List<ScheduleTrack> scheduleList = scheduleTrackMapper.queryPersonalScheduleListByTime(practitionerId, time);
+            List<ScheduleTrack> scheduleList = scheduleTrackMapper.queryPersonalScheduleListByTime(practitionerId, time, new Date());
             // 计算增员日程和销售日程的得分
             List<Long> saleOption = mdDropOptionsDALService.queryIdByByDropMasterCode("bizchance_promotion_action");
             List<Long> RecruitOption = mdDropOptionsDALService.queryIdByByDropMasterCode("team_building_track");

yd-api/src/main/java/com/yd/dal/mapper/marketing/ScheduleTrackMapper.java

@@ -21,9 +21,9 @@ public interface ScheduleTrackMapper {
 
     List<Long> queryTeamAllPractitionerId(@Param("practitionerId")Long practitionerId);
 
-    List<PersonalSchedule> queryPersonalScheduleList(List<Long> practitionerIdList);
+    List<PersonalSchedule> queryPersonalScheduleList(@Param("list")List<Long> practitionerIdList, @Param("trackDate")Date trackDate);
 
-    List<ScheduleTrack> queryPersonalScheduleListByTime(@Param("practitionerId")Long practitionerId, @Param("time")String time);
+    List<ScheduleTrack> queryPersonalScheduleListByTime(@Param("practitionerId")Long practitionerId, @Param("time")String time, @Param("trackDate")Date trackDate);
 
     void deleteScheduleTrackById(@Param("scheduleTrackId")Long scheduleTrackId);
 

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

@@ -190,7 +190,7 @@
         FROM
             ag_mkt_schedule_task_tracking t
         WHERE 1=1
-        AND DATEDIFF(#{trackDate,jdbcType=VARCHAR},track_time) < 365
+        AND DATEDIFF(#{trackDate,jdbcType=TIMESTAMP},track_time) < 365
         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 = 'pep_schedule_task_others'
@@ -231,7 +231,7 @@
             created_at, created_by, updated_at, updated_by, updator_type, creator_type
             from ag_mkt_schedule_task_tracking t
         where t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
-            and DATEDIFF(#{trackDate,jdbcType=VARCHAR},track_time) < 365
+            and DATEDIFF(#{trackDate,jdbcType=TIMESTAMP},track_time) < 365
             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 = 'pep_schedule_task_others'