Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into zx_online_update_1218

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseHomeworkServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,29 +50,29 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
 
     private static final Logger log = LoggerFactory.getLogger(CourseHomeworkServiceImpl.class);
 
-    @Autowired
+    @Resource
     @Lazy
     private CourseScheduleService courseScheduleService;
 
-    @Autowired
+    @Resource
     private StudentCourseHomeworkService studentCourseHomeworkService;
 
-    @Autowired
+    @Resource
     private SysMessageService sysMessageService;
 
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
-    @Autowired
+    @Resource
     private ImGroupService imGroupService;
 
-    @Autowired
+    @Resource
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
 
-    @Autowired
+    @Resource
     private SysConfigService sysConfigService;
 
-    @Autowired
+    @Resource
     private WordFilter wordFilter;
 
 	@Override
@@ -242,17 +243,24 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     @Transactional(rollbackFor = Exception.class)
     public boolean decorateCourseHomework(CourseHomeworkSaveDto saveDto) {
         // 检查 老师 趣纠课 课程状态为完成，有学生考勤记录 没有布置作业
-        checkCourseSchedule(saveDto.getCourseScheduleId());
-
+        CourseSchedule courseSchedule = courseScheduleService.getById(saveDto.getCourseScheduleId());
+        // 2. 检查课程结束
+        if (!CourseScheduleEnum.COMPLETE.getCode().equals(courseSchedule.getStatus())) {
+            throw  new BizException("课程未正常完成，不能布置课后作业");
+        }
         // 检查已经布置了课后作业
         CourseHomework homework = checkHasHomework(saveDto.getCourseScheduleId());
         if (homework != null) {
             saveDto.setCourseHomeworkId(homework.getId());
         }
-
-        CourseSchedule courseSchedule = courseScheduleService.getById(saveDto.getCourseScheduleId());
         // 创建课后作业
         CourseHomework courseHomework = getCourseHomework(saveDto, courseSchedule);
+        //获取学生人数
+        List<CourseScheduleStudentPayment> studentPaymentList = courseScheduleStudentPaymentService.getByCourseId(
+                courseSchedule.getId());
+        if (!CollectionUtils.isEmpty(studentPaymentList)) {
+            courseHomework.setExpectNum(studentPaymentList.size());
+        }
 
         boolean flag = this.saveOrUpdate(courseHomework);