完善接口

slive/src/main/java/com/xhkjedu/slive/service/xz/XzService.java

@@ -571,23 +571,24 @@ public class XzService {
                 //获取已生成课程的往后日期
                 List<String> alldates = xzMapper.getAllDatesForKj(kjTeaVo.getKjid(), kjTeaVo.getClassid(), kjTeaVo.getSeldate());
                 if (alldates != null && alldates.size() > 0) {
-                    //去匹配是否包含在当前选中日期后续周对应的日期
+                    //去匹配是否包含在当前选中日期后续周对应的日期，主要是为了判断是否有已生成的课
                     List<String> afterlst = LiveUtil.getMeetDayOfDates(alldates, kjTeaVo.getSeldate());
                     if (afterlst != null && afterlst.size() > 0) {
                         return new ResultVo(1, "同日期同班级同课节有数据，不能保存");
-                    } else {
-                        //获取seldate至结束日期时端内符合条件的日期
-                        List<String> savedates = LiveUtil.getDaysForMeetDates(kjTeaVo.getSeldate(), xz.getEnddate());
-                        for (int i = 0; i < savedates.size(); i++) {
-                            kjTeaVo.setSeldate(savedates.get(i));
-
-                            Integer rtnid = ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
-                            if(i==0){
-                                courseid = rtnid;
-                            }
+                    }
+                }
 
-                        }
+                //说明当前日期（包含当前日期）往后都没有课，则直接处理
+                //获取seldate至结束日期时端内符合条件的日期
+                List<String> savedates = LiveUtil.getDaysForMeetDates(kjTeaVo.getSeldate(), xz.getEnddate());
+                for (int i = 0; i < savedates.size(); i++) {
+                    kjTeaVo.setSeldate(savedates.get(i));
+
+                    Integer rtnid = ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                    if(i==0){
+                        courseid = rtnid;
                     }
+
                 }
             }
             return new ResultVo(0, "成功保存课程表单个课程",courseid);

slive/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml

@@ -20,6 +20,6 @@
     <!--保存班级学生到指定班级-->
     <insert id="saveAllClassStu">
         insert ignore into t_class_student (classid,studentid,createid,createtime,schoolid)
-        SELECT #{zbclassid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid});
+        SELECT #{zbclassid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid};
     </insert>
 </mapper>

slive/src/main/resources/mapper/gradeclass/GroupMapper.xml

@@ -15,6 +15,6 @@
     <!--保存全部分组学生-->
     <insert id="saveAllClassGroupStu">
         insert ignore into t_group_student (classid,groupid,studentid,createid,createtime,schoolid)
-        SELECT #{zbclassid},#{zbgroupid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid});
+        SELECT #{zbclassid},#{zbgroupid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid};
     </insert>
 </mapper>