From 276aa88269f71f98d182de1f0e67b24f2ce9fd66 Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Mon, 21 Feb 2022 11:37:37 +0800
Subject: [PATCH] fix copy bug

---
 oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java      | 6 +++---
 service/src/main/java/com/sv/mapper/VenueLessonMapper.java  | 2 +-
 .../main/java/com/sv/service/oms/VenueLessonService.java    | 4 ++--
 .../main/resources/mybatis/mapper/sv/VenueLessonMapper.xml  | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
index 260ff23..a78bda1 100644
--- a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
+++ b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
@@ -43,8 +43,8 @@ public class CopyLessonTask {
     @Scheduled(cron = "0 */1 * * * ?")
     public void execute(){
         logger.info("开始执行拷贝课程批处理");
-        LocalTime time = LocalTime.now();
-        LocalDate date = LocalDate.now();
+        LocalTime time = LocalTime.parse("09:00");
+        LocalDate date = LocalDate.parse("2022-02-21");
         logger.info(time.toString());
         logger.info(date.toString());
         int cWeek = date.getDayOfWeek().getValue();
@@ -59,7 +59,7 @@ public class CopyLessonTask {
                     LocalDate endDate = date.plusDays(-1);
                     String startTime = dtf.format(startDate);
                     String endTime = dtf.format(endDate);
-                    List<VenueLesson> allForCopy = venueLessonService.findAllForCopy(startTime, endTime);
+                    List<VenueLesson> allForCopy = venueLessonService.findAllForCopy(startTime, endTime,venue.getId());
                     if (allForCopy!= null && allForCopy.size()>0){
                         logger.info("需要操作的课程数为：" + allForCopy.size());
                         Integer copyTarget = venue.getCopyTarget();
diff --git a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java
index a446e4d..37777b4 100644
--- a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java
+++ b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java
@@ -158,5 +158,5 @@ public interface VenueLessonMapper {
 
     void copyImg(@Param("id") Integer id,@Param("nId") Integer nId);
 
-    List<VenueLesson> findAllForCopy(@Param("leftTime") String leftTime, @Param("rightTime") String rightTime);
+    List<VenueLesson> findAllForCopy(@Param("leftTime") String leftTime, @Param("rightTime") String rightTime, @Param("venueId") Integer venueId);
 }
diff --git a/service/src/main/java/com/sv/service/oms/VenueLessonService.java b/service/src/main/java/com/sv/service/oms/VenueLessonService.java
index 3add635..50b3006 100644
--- a/service/src/main/java/com/sv/service/oms/VenueLessonService.java
+++ b/service/src/main/java/com/sv/service/oms/VenueLessonService.java
@@ -295,8 +295,8 @@ public class VenueLessonService extends BaseServiceImpl {
      *
      * @return 需要拷贝的场馆课程
      */
-    public List<VenueLesson> findAllForCopy(String leftTime, String rightTime) {
-        return venueLessonMapper.findAllForCopy(leftTime, rightTime);
+    public List<VenueLesson> findAllForCopy(String leftTime, String rightTime,Integer venueId) {
+        return venueLessonMapper.findAllForCopy(leftTime, rightTime, venueId);
     }
 
     /**
diff --git a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
index 512c996..3502005 100644
--- a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
@@ -683,6 +683,9 @@
         <if test="rightTime != null">
             and date &lt;= #{rightTime}
         </if>
+        <if test="venueId != null">
+            and venue_id = #{venueId}
+        </if>
     </select>
 
 </mapper>