课表导入

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java

@@ -184,14 +184,7 @@ public class XzController {
         Integer xzid = xz.getXzid();
         Integer createid = xz.getCreateid();
         N_Utils.validation(new Object[]{xzid, "行政直播id", 1, createid, "创建人id", 1});
-        /*Map<String, Object> map = PoiUtils.readKb(file, xz, xzService);
-        Integer code = (Integer) map.get("code");
-        if (code != 0) return new ResultVo(1, map.get("msg").toString());
-        LinkedHashMap<Integer, List<String>> errMsg = (LinkedHashMap<Integer, List<String>>) map.get("errMsg");
-        if (errMsg.size() != 0) return new ResultVo(1, null, errMsg);
-        List<XzDateVo> xzdatas = (List<XzDateVo>) map.get("xzdatas");*/
         return xzService.importKb(file, xzid, createid);
-        //return new ResultVo(0, "导入评价用户成功");
     }
 
 }

slive/src/main/java/com/xhkjedu/slive/mapper/gradeclass/ClassTeacherMapper.java

@@ -25,4 +25,7 @@ public interface ClassTeacherMapper extends TkMapper<TClassTeacher> {
 
     //获取科目列表
     List<CTeacherVo> listSubjectBySubjectIds(@Param("subjectids") String subjectids);
+
+    //获取学校所有教师
+    List<CTeacherVo> listTeacherBySchoolId(@Param("schoolid") Integer schoolid);
 }

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

@@ -725,6 +725,9 @@ public class XzService {
         try {
             //获取行政直播信息
             LXz xz = xzMapper.selectByPrimaryKey(xzid);
+            List<XzKjVo> kjs = xzKjMapper.listXzKjByXzId(xzid);//获取行政直播课节详情
+            Integer noTimeKjNum = kjs.stream().filter(k -> k.getBegintime() == null).collect(Collectors.toList()).size();
+            if (noTimeKjNum != 0) return new ResultVo(1, "请设置课节时间");
 
             //根据行政直播id获取该学校当前年份指定年级下的行政班和提高班
             Integer gradeid = xz.getGradeid();
@@ -740,16 +743,19 @@ public class XzService {
             Map<String, String> subjectNameMap = subjects2.stream().collect(Collectors.toMap(CTeacherVo::getSubjectid, CTeacherVo::getSubjectname));
             Map<Integer, String> subjectMap = subjects.stream().collect(Collectors.toMap(CTeacherVo::getTeacherid, CTeacherVo::getSubjectid));
             Map<Integer, String> classMap = classlst.stream().collect(Collectors.toMap(XzClassVo::getClassid, XzClassVo::getClassname));
+            List<CTeacherVo> users = classTeacherMapper.listTeacherBySchoolId(schoolid);//获取学校所有教师
+            Set<String> userNameSet = users.stream().map(CTeacherVo::getUsername).collect(Collectors.toCollection(TreeSet::new));
             Map<String, CTeacherVo> classTeacherMap = new HashMap<>();//班级教师map
             for (CTeacherVo teacher : teachers) {
+                CTeacherVo vo = users.stream().filter(u -> u.getTeacherid().equals(teacher.getTeacherid())).findFirst().orElse(null);
+                if (vo != null) teacher.setUsername(vo.getUsername());
                 teacher.setClassname(classMap.get(teacher.getClassid()));
                 teacher.setSubjectid(subjectMap.get(teacher.getTeacherid()));
                 teacher.setSubjectname(subjectNameMap.get(teacher.getSubjectid()));
                 classTeacherMap.put(teacher.getClassname() + "_" + teacher.getUsername(), teacher);
             }
-            List<XzKjVo> kjs = xzKjMapper.listXzKjByXzId(xzid);//获取行政直播课节详情
 
-            Map<String, Object> map = PoiUtils.readKb(file, xz, classTeacherMap, kjs);
+            Map<String, Object> map = PoiUtils.readKb(file, xz, classTeacherMap, userNameSet, kjs);
             Integer code = (Integer) map.get("code");
             if (code != 0) return new ResultVo(1, map.get("msg").toString());
             LinkedHashMap<String, List<String>> errMsg = (LinkedHashMap<String, List<String>>) map.get("errMsg");
@@ -819,6 +825,8 @@ public class XzService {
                 c.setGradeid(gradeid);
                 c.setClasstype(99);//已直播班级
                 c.setCreatetime(createtime);
+                c.setClassnum(0);
+                c.setClassstate(1);
                 classList.add(c);
 
                 TClassTeacher ct = new TClassTeacher();

slive/src/main/java/com/xhkjedu/slive/utils/PoiUtils.java

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -167,7 +168,7 @@ public class PoiUtils {
      * @Date 2022/6/21 15:13
      **/
     public static Map<String, Object> readKb(MultipartFile file, LXz xz
-            , Map<String, CTeacherVo> classTeacherMap, List<XzKjVo> kjs) {
+            , Map<String, CTeacherVo> classTeacherMap, Set<String> userNameSet, List<XzKjVo> kjs) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, List<String>> errMsg = new LinkedHashMap<>();
         try {
@@ -192,6 +193,7 @@ public class PoiUtils {
                 sheet = work.getSheetAt(i);
                 String sheetName = sheet.getSheetName();
                 String sectiondate = weeks.get(sheetName);
+                if (sectiondate == null) continue;//没有当天的课不处理
                 int rows = sheet.getLastRowNum(); // 获取最后一个实际行的下标，比行数小1
                 int firstRowNum = sheet.getFirstRowNum(); // 获取第一个实际行的下标，（firstRowNum=0）
                 //遍历当前sheet中的所有行，排除第一行（标题）不纳入遍历
@@ -207,6 +209,7 @@ public class PoiUtils {
                     int lastCellNum = row.getLastCellNum();// 每一行的最后一列，获取列数，比最后一列列标大1
                     if (lastCellNum > daynum) lastCellNum = daynum;//节数大于课程的节数不处理
                     List<String> mrows = new ArrayList<>();
+                    String errMsgKey = sheetName + "第" + (x + 1) + "行";
                     //遍历所有的列
                     String classname = getCellValue(row.getCell(0));//第一列为班级
                     for (int y = firstCellNum + 1; y <= lastCellNum; y++) {
@@ -214,17 +217,22 @@ public class PoiUtils {
                         String username = getCellValue(cell);
                         if (N_Utils.isEmpty(username)) {
                             if (y == lastCellNum && N_Utils.isListNotEmpty(mrows)) {
-                                errMsg.put(sheetName + "_" + (x + 1), mrows);
+                                errMsg.put(errMsgKey, mrows);
                             }
                             continue;//教师为空执行下一条数据
                         }
                         CTeacherVo vo = classTeacherMap.get(classname + "_" + username);
-                        if (vo == null) {
-                            mrows.add("本班下教师【" + username + "】不存在");
+                        Integer kjorder = y;//课节排序
+                        XzKjVo kj = kjs.stream().filter(k -> k.getKjorder() == kjorder).findFirst().orElse(null);
+                        String kjname = kj.getKjname();
+                        if (!userNameSet.contains(username)) {
+                            mrows.add(kjname + "【" + username + "】不存在");
+                        } else if (vo == null) {
+                            mrows.add(kjname + "【" + username + "】与【" + classname + "】不匹配");
+                        } else if (N_Utils.isEmpty(vo.getSubjectid())) {
+                            mrows.add(kjname + "【" + username + "】未设置科目");
                         } else {
-                            Integer kjorder = y;//课节排序
-                            XzKjVo kj = kjs.stream().filter(k -> k.getKjorder() == kjorder).findFirst().orElse(null);
-                            String coursename = sheetName + kj.getKjname() + vo.getSubjectname() + "(" + username + ")";
+                            String coursename = sheetName + kjname + vo.getSubjectname() + "(" + username + ")";
                             LCourse t = new LCourse();
                             Integer kjid = kjMap.get(y).get(0).getKjid();
                             t.setKjid(kjid);
@@ -234,7 +242,9 @@ public class PoiUtils {
                             t.setTeacherid(vo.getTeacherid());
                             t.setBegintime(kj.getBegintime());
                             t.setEndtime(kj.getEndtime());
-                            Integer sectionstate = kj.getSectionstate();
+                            kj = kjs.stream().filter(k -> k.getKjorder() == kjorder
+                                    && sectiondate.equals(k.getSectiondate())).findFirst().orElse(null);
+                            Integer sectionstate = kj == null ? null : kj.getSectionstate();
                             if (sectionstate == null || sectionstate == 0) {//已经开始或结束的课不处理
                                 t.setBegindate(sectiondate);
                                 t.setEnddate(sectiondate);
@@ -242,16 +252,21 @@ public class PoiUtils {
                             }
                             List<String> meetDates = LiveUtil.getDaysForMeetDates(sectiondate, enddate);
                             for (int m = 1; m < meetDates.size(); m++) {
+                                String date = meetDates.get(m);
+                                String begintime = date + " " + t.getBegintime();
+                                Integer beginTimestamp = N_Utils.getDataToTimestamp(begintime, "yyyy-MM-dd HH:mm");
+                                Integer timestamp = N_Utils.getSecondTimestamp();
+                                if (beginTimestamp.compareTo(timestamp) != 1) continue;//如果课节开始时间不大于当前时间不处理
+
                                 LCourse t2 = new LCourse();
                                 BeanUtils.copyProperties(t, t2);
-                                String date = meetDates.get(m);
                                 t2.setBegindate(date);
                                 t2.setEnddate(date);
                                 kjTeas.add(t2);
                             }
                         }
                         if (y == lastCellNum && N_Utils.isListNotEmpty(mrows)) {
-                            errMsg.put(sheetName + "_" + (x + 1), mrows);
+                            errMsg.put(errMsgKey, mrows);
                         }
                     }
                 }

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

@@ -15,9 +15,9 @@
     </select>
     <!--获取班级教师-->
     <select id="listTeacherByClassIds" resultType="com.xhkjedu.slive.vo.gradeclass.CTeacherVo">
-        select ct.classid,ct.teacherid,u.username
-        from t_class_teacher ct left join t_user u on ct.teacherid=u.userid
-        where ct.classid in(${classids}) and u.usertype=1 and u.userstate=1
+        select ct.classid,ct.teacherid
+        from t_class_teacher ct
+        where ct.classid in(${classids})
     </select>
     <!--获取教师科目-->
     <select id="listSubjectByTeacherIds" resultType="com.xhkjedu.slive.vo.gradeclass.CTeacherVo">
@@ -30,4 +30,8 @@
     <select id="listSubjectBySubjectIds" resultType="com.xhkjedu.slive.vo.gradeclass.CTeacherVo">
         select subjectid,subjectname from t_subject where subjectid in('${subjectids}')
     </select>
+    <!--获取学校所有教师-->
+    <select id="listTeacherBySchoolId" resultType="com.xhkjedu.slive.vo.gradeclass.CTeacherVo">
+        select userid teacherid,username from t_user where schoolid=#{schoolid} and usertype=1 and userstate=1
+    </select>
 </mapper>