修改bug

fs-admin/src/main/java/com/fs/qw/controller/QwSopTempController.java

@@ -129,7 +129,7 @@ public class QwSopTempController extends BaseController
         qwSopTemp.setCreateBy(loginUser.getUser().getUserId().toString());
         int i = qwSopTempService.addNew(qwSopTemp);
         if(qwSopTemp.getSendType() == 11){
-            qwSopTempService.createSopTempRules(qwSopTemp);
+            new Thread(() -> qwSopTempService.createSopTempRules(qwSopTemp)).start();
         }
         return toAjax(i);
     }

fs-company-app/src/main/resources/application.yml

@@ -4,5 +4,7 @@ server:
 
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+    active: druid-fby
+    include: common,config-fby

fs-company/src/main/java/com/fs/qw/QwSopTempController.java

@@ -137,7 +137,7 @@ public class QwSopTempController extends BaseController
         qwSopTemp.setCreateBy(loginUser.getUser().getUserId().toString());
         int i = qwSopTempService.addNew(qwSopTemp);
         if(qwSopTemp.getSendType() == 11){
-            qwSopTempService.createSopTempRules(qwSopTemp);
+            new Thread(() -> qwSopTempService.createSopTempRules(qwSopTemp)).start();
         }
         return toAjax(i);
     }

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -158,13 +158,19 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
             day.setLesson(dayList.size() + i.getAndIncrement());
             day.setDayDate(period.getPeriodStartingTime().plusDays(day.getLesson()));
             day.setCourseId(entity.getCourseId());
-            if(video.getViewStartTime() != null){
+            if(entity.getStartTime() != null){
+                day.setStartDateTime(LocalDateTime.of(day.getDayDate(), entity.getStartTime()));
+            }else if(video.getViewStartTime() != null){
                 day.setStartDateTime(LocalDateTime.of(day.getDayDate(), video.getViewStartTime()));
             }
-            if(video.getViewEndTime() != null){
+            if(entity.getEndTime1() != null){
+                day.setEndDateTime(LocalDateTime.of(day.getDayDate(), entity.getEndTime1()));
+            }else if(video.getViewEndTime() != null){
                 day.setEndDateTime(LocalDateTime.of(day.getDayDate(), video.getViewEndTime()));
             }
-            if(video.getLastJoinTime() != null){
+            if(entity.getJoinTime() != null){
+                day.setLastJoinTime(LocalDateTime.of(day.getDayDate(), entity.getJoinTime()));
+            }else if(video.getLastJoinTime() != null){
                 day.setLastJoinTime(LocalDateTime.of(day.getDayDate(), video.getLastJoinTime()));
             }
             day.setVideoId(e);

fs-service-system/src/main/java/com/fs/sop/domain/QwSopTemp.java

@@ -8,6 +8,7 @@ import com.fs.common.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -69,6 +70,8 @@ public class QwSopTemp implements Serializable
     @TableField(exist = false)
     private boolean cuoser;
     @TableField(exist = false)
+    private LocalTime time;
+    @TableField(exist = false)
     private List<QwSopTempDay> list = new ArrayList<>();
     @TableField(exist = false)
     private List<String> timeList;

fs-service-system/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -213,10 +213,9 @@ public class QwSopTempServiceImpl implements IQwSopTempService {
                 timeList = JSON.parseArray(JSON.toJSONString(temp.getTimeList()), String.class);
             }
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-            if (e.getViewStartTime() == null) {
-                e.setViewStartTime(LocalTime.of(9, 0));
+            if(temp.getTime() != null){
+                timeList.add(0, temp.getTime().format(formatter));
             }
-            timeList.add(0, e.getViewStartTime().format(formatter));
             AtomicInteger sorts = new AtomicInteger(0);
             List<QwSopTempRules> rulesList = timeList.stream().map(time -> {
                 QwSopTempRules rules = new QwSopTempRules();