去除临时表

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolgrade/SchoolGradeMapper.java

@@ -33,4 +33,6 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> {
     List<SchoolGrade> selectNowSchoolGrade();
 
     public  Long selectDdClassId(String ddClssId);
+
+    String selectUpToYear();
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java

@@ -243,4 +243,9 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
     public Long selectDdClassId(String ddId) {
         return schoolGradeMapper.selectDdClassId(ddId);
     }
+
+    @Override
+    public String selectUpToYear() {
+        return schoolGradeMapper.selectUpToYear();
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolgrade/ISchoolGradeService.java

@@ -26,5 +26,6 @@ public interface ISchoolGradeService extends IService<SchoolGrade> {
     //获取最新学年
     int isNewSchoolYear();
     Long selectDdClassId(String ddId);
+    String  selectUpToYear();
 
 }

smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java

@@ -2,44 +2,35 @@ package yangtz.cs.liu.dingding.controller;
 
 
 import cn.hutool.http.HttpUtil;
-//import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SchoolTeacher;
-import com.ruoyi.common.core.domain.entity.SchoolTeacherCopy;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysUserService;
-import org.apache.regexp.RE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import yangtz.cs.liu.campus.controller.schoolClass.SchoolClassController;
 import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
-import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassCopy;
 import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster;
 import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
 import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
-import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeCopy;
 import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
 import yangtz.cs.liu.campus.domain.student.SchoolStudent;
 import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation;
 import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
 import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
-import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassCopyService;
 import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService;
 import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
 import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
-import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeCopyService;
 import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
 import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
 import yangtz.cs.liu.campus.service.student.ISchoolStudentClassRelationService;
 import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
 import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
 import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
-import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherCopyService;
 import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
 import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
 import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
@@ -48,7 +39,6 @@ import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 家校通讯录
@@ -68,9 +58,6 @@ public class DingJiaXiaoController {
     @Autowired
    ISchoolGradeService schoolGradeService;
 
-    //年级临时表
-    @Autowired
-    ISchoolGradeCopyService iSchoolGradeCopyService;
 
     //职工与年级关系 ----------------
     @Autowired
@@ -78,9 +65,6 @@ public class DingJiaXiaoController {
     //学校班级
     @Autowired
     ISchoolClassService iSchoolClassService;
-    //班级表临时
-    @Autowired
-    ISchoolClassCopyService iSchoolClassCopyService;
     //班主任和班级关系   ------------------
     @Autowired
     ISchoolClassHeadmasterService iSchoolClassHeadmasterService;
@@ -102,15 +86,10 @@ public class DingJiaXiaoController {
     //老师表
     @Autowired
     ISchoolTeacherService schoolTeacherService;
-    //老师表 临时表
-    @Autowired
-    ISchoolTeacherCopyService schoolTeacherCopyService;
-
     //用户表        ----------------
     @Autowired
     ISysUserService sysUserService;
 
-
     public List<String> userTypes = new ArrayList<String>(){
         {
             this.add("teacher");
@@ -284,7 +263,7 @@ public class DingJiaXiaoController {
     @GetMapping("/updateLabUser")
     private String updateLabUser(){
         //查找当前学年 所有的班级
-        String nowSchoolYear = iSchoolGradeCopyService.selectUpToYear();
+        String nowSchoolYear = schoolGradeService.selectUpToYear();
         SchoolClass schoolClass = new SchoolClass();
         schoolClass.setSchoolYear(Integer.valueOf(nowSchoolYear));
         List<SchoolClass> schoolClassCopies = iSchoolClassService.selectSchoolClassList(schoolClass);
@@ -356,7 +335,7 @@ public class DingJiaXiaoController {
                             schoolStudentClassRelation.setClassId(date.getId());
                             iSchoolStudentClassRelationService.save(schoolStudentClassRelation);
                             //学生与班级历史关系
-                            SchoolClassCopy school= iSchoolClassCopyService.selectSchoolClassById(date.getId());
+                            SchoolClass school= iSchoolClassService.selectSchoolClassById(date.getId());
                             SchoolStudentClasses schoolStudentClasses = new SchoolStudentClasses();
                             schoolStudentClasses.setStudentId(schoolStudent.getId());
                             schoolStudentClasses.setGrade(school.getGradeName());

smart-campus/src/main/resources/mapper/schoolgrade/SchoolGradeMapper.xml

@@ -58,4 +58,8 @@
         select sg.id from school_grade_copy sg
         where sg.del_flag = '0'  and sg.dd_class_id=#{ddClssId}
     </select>
+    <select id="selectUpToYear" resultType="java.lang.String">
+        select max(school_year) nowYear from school_grade_copy where del_flag = '0'
+    </select>
+
 </mapper>