Sfoglia il codice sorgente

1、陪练课调整
2、付费陪练课可预约时间调整

Joburgess 5 anni fa
parent
commit
b06b3fa2b1

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3389,14 +3389,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("请指定推送类型:JIGUANG、SMS、ALL");
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
-
         List<CourseScheduleEvaluate> reports = courseScheduleEvaluateDao.findExpiredDateBeforeReport(expiredDate);
 
         if(CollectionUtils.isEmpty(reports)){
             return;
         }
 
+        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+
         for (CourseScheduleEvaluate report : reports) {
             PracticeGroup userFreePracticeGroup = practiceGroupDao.get(Long.valueOf(report.getMusicGroupId()));
             if(Objects.isNull(userFreePracticeGroup)){
@@ -3406,7 +3406,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());
             if(Objects.isNull(courseScheduleEvaluate)){
-                throw new BizException("未生成课程报告");
+                continue;
             }
 
             String pushUrl = baseApiUrl + "/#/reportDetail?classGroupId=" + classGroup.getId();

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleEvaluateMapper.xml

@@ -105,7 +105,7 @@
     </select>
     <select id="findExpiredDateBeforeReport" resultMap="CourseScheduleEvaluate">
       SELECT * FROM course_schedule_evaluate
-      WHERE DATE_FORMAT(create_time_, '%Y-%m-%d') &lt;= DATE_FORMAT(#{expiredDate}, '%Y-%m-%d')
+      WHERE create_time_ &lt;= #{expiredDate}
       AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
     </select>
 </mapper>