专业 学院同步

# Conflicts:
#	srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java

dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java

@@ -843,6 +843,13 @@ public class ISrsDormitoryStudentServiceImpl extends ServiceImpl<SrsDormitoryStu
     public AjaxResult assignDormitoryByTeacher(String teacherEmployeeId) {
         try {
             List<SrsStuReg> stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId);
+
+            List<String> kshList = stuList.stream().map(SrsStuReg::getKSH).collect(Collectors.toList());
+
+            QueryWrapper<DmsNewReg>  queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("ksh",kshList);
+            _newRegMapper.delete(queryWrapper);
+
             List<DmsDormitoryClass> dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId);
 
             // 查询所有已分配的ksh，避免重复插入

dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml

@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dormitoryId != null">and a.dormitory_id = #{dormitoryId}</if>
             <if test="classCode != null">and b.BJDM = #{classCode}</if>
         </where>
+        order by a.ksh asc
     </select>
 
     <select id="getStuDorm" resultType="DomInfo" parameterType="DmsSearch">

srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryClassController.java

@@ -62,7 +62,7 @@ public class DmsDormitoryClassController extends BaseController {
 
 
     @Autowired
-    private ISrsDormitoryStudentService  iDormitoryStudentService;
+    private ISrsDormitoryStudentService iDormitoryStudentService;
 
 
     @ApiOperation("自动分配宿舍")

srs-admin/src/main/java/com/srs/web/controller/stureg/SrsStuRegController.java

@@ -14,6 +14,7 @@ import com.srs.comprehensive.domain.Vo.CphSearch;
 import com.srs.comprehensive.domain.Vo.DataScreen;
 import com.srs.comprehensive.service.ISrsMajorsService;
 import com.srs.framework.web.domain.server.Sys;
+import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx;
 import com.srs.stureg.domain.SrsStuReg;
 import com.srs.stureg.domain.SrsStuRegImport;
 import com.srs.stureg.service.ISrsStuRegService;
@@ -56,6 +57,24 @@ public class SrsStuRegController extends BaseController
     @Autowired
     ISrsMajorsService srsMajorsService;
 
+    @PreAuthorize("@ss.hasPermi('stureg:temp:index')")
+    @ApiOperation("同步班级代码")
+    @PostMapping("/syncClassCode")
+    public AjaxResult syncClassCode(){
+        return srsStuRegService.syncClassCode();
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('stureg:temp:index')")
+    @ApiOperation("列出新生临时数据")
+    @GetMapping("/listXsxxTemp")
+    public TableDataInfo listXsxxTemp(GxsdxySjzx009Temp2024xsxx param){
+        startPage();
+        List<GxsdxySjzx009Temp2024xsxx> res =  srsStuRegService.listXsxxTemp(param);
+        return getDataTable(res);
+    }
+
+
     @ApiOperation("统计住宿")
     @GetMapping("/countRoomBed")
     public AjaxResult countRoomBed(){

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCeScoreMapper.java

@@ -3,21 +3,22 @@ package com.srs.comprehensive.mapper;
 import java.util.List;
 
 import com.srs.comprehensive.domain.SrsCeScore;
+import com.srs.comprehensive.domain.SrsStudent;
 import com.srs.comprehensive.domain.Vo.SrsCeScoreStudentStuYear;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 综合评价Mapper接口
- * 
+ *
  * @author srs
  * @date 2023-06-28
  */
 @Mapper
-public interface SrsCeScoreMapper 
-{
+public interface SrsCeScoreMapper {
     /**
      * 查询综合评价
-     * 
+     *
      * @param id 综合评价主键
      * @return 综合评价
      */
@@ -25,16 +26,17 @@ public interface SrsCeScoreMapper
 
     /**
      * 查询综合评价列表
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 综合评价集合
      */
     public List<SrsCeScore> selectSrsCeScoreList(SrsCeScore srsCeScore);
+
     public List<SrsCeScore> selectSrsCeScoreListS(SrsCeScore srsCeScore);
 
     /**
      * 新增综合评价
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 结果
      */
@@ -42,15 +44,17 @@ public interface SrsCeScoreMapper
 
     /**
      * 修改综合评价
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 结果
      */
     public int updateSrsCeScore(SrsCeScore srsCeScore);
 
+
+
     /**
      * 删除综合评价
-     * 
+     *
      * @param id 综合评价主键
      * @return 结果
      */
@@ -58,14 +62,15 @@ public interface SrsCeScoreMapper
 
     /**
      * 批量删除综合评价
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteSrsCeScoreByIds(Long[] ids);
 
     /**
-     *综合评价连表查询
+     * 综合评价连表查询
+     *
      * @return 结果
      */
     List<SrsCeScoreStudentStuYear> SrsCeScoreStudentStuYear(SrsCeScore srsCeScore);

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java

@@ -81,4 +81,6 @@ public interface SrsMajorsMapper extends EasyBaseMapper<SrsMajors>
     void updateSrsStudentList(@Param("studentList") List<SrsMajors> studentList);
 
     Long selectXYID(String xydm);
+
+    Long selectOldDeptIdByDeptName(String deptName);
 }

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java

@@ -36,7 +36,8 @@ public interface SrsStudentMapper extends EasyBaseMapper<SrsStudent>
 
     public List<StuCount> countParkStu();
 
-
+    // 根据多个班级ID查询学生
+    List<SrsStudent> selectSrsStudentByClassIds(@Param("classIds") List<Long> classIds);
     public List<StuCount> countLakeGradeStu();
 
 

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCeScoreServiceImpl.java

@@ -25,7 +25,7 @@ import static com.srs.common.utils.SecurityUtils.getUsername;
 
 /**
  * 综合评价Service业务层处理
- * 
+ *
  * @author srs
  * @date 2023-06-28
  */
@@ -54,7 +54,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 查询综合评价
-     * 
+     *
      * @param id 综合评价主键
      * @return 综合评价
      */
@@ -66,7 +66,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 查询综合评价列表
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 综合评价
      */
@@ -78,7 +78,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 新增综合评价
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 结果
      */
@@ -91,7 +91,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 修改综合评价
-     * 
+     *
      * @param srsCeScore 综合评价
      * @return 结果
      */
@@ -104,7 +104,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 批量删除综合评价
-     * 
+     *
      * @param ids 需要删除的综合评价主键
      * @return 结果
      */
@@ -116,7 +116,7 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
 
     /**
      * 删除综合评价信息
-     * 
+     *
      * @param id 综合评价主键
      * @return 结果
      */
@@ -147,76 +147,99 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
                     student.setStuNo(student.getStuNo().trim());
                     return student;
                 })
-                .collect(Collectors.toList());//清空前后空格
-        int number=0;
-        StringBuilder error= new StringBuilder();
-        //查询辅导员
+                .collect(Collectors.toList());
+
+        int number = 0;
+        StringBuilder error = new StringBuilder();
+
+        // 查询辅导员
         CphTeacher cphTeacher = cphTeacherMapper.searchTeacherByTno(getUsername());
         SysUser sysUser = sysUserMapper.selectUserByUserName(getUsername());
+
         if (!Objects.equals(sysUser.getUserName(), "admin")) {
-            List<SrsStudent> srsStudentList = new ArrayList<>();//辅导员所带的学生
-            //查询班级
+            List<SrsStudent> srsStudentList = new ArrayList<>();
+            // 查询班级
             SrsClass srsClass = new SrsClass();
             srsClass.setTeacherId(cphTeacher.getTeacherId());
-            List<SrsClass> srsClasses = srsClassMapper.selectSrsClassListTeacherId(srsClass);//班级
-            //查询辅导员所带的班级学生
-            for (SrsClass scs : srsClasses) {
-                SrsStudent srsStudent = new SrsStudent();
-                srsStudent.setClassId(scs.getClassId());
-//                srsStudent.setStatus("01");
-                //根据班级id查询学生
-                List<SrsStudent> srsStudentList1 = srsStudentMapper.selectSrsStudentList(srsStudent);
-                srsStudentList.addAll(srsStudentList1);
+            List<SrsClass> srsClasses = srsClassMapper.selectSrsClassListTeacherId(srsClass);
+
+            // 查询辅导员所带的班级学生 - 优化为批量查询
+            if (!srsClasses.isEmpty()) {
+                List<Long> classIds = srsClasses.stream()
+                        .map(SrsClass::getClassId)
+                        .collect(Collectors.toList());
+                srsStudentList = srsStudentMapper.selectSrsStudentByClassIds(classIds);
             }
+
+            // 验证学生是否属于当前辅导员
             for (SrsCeScoreStudent scss : srsCeScoreStudents) {
-                if (scss.getCeScore().compareTo(new BigDecimal(100))>0){
+                if (scss.getCeScore().compareTo(new BigDecimal(100)) > 0) {
                     scss.setCeScore(new BigDecimal(100));
                 }
-                int i = 0;
-                for (SrsStudent ssd : srsStudentList) {
-                    if (Objects.equals(scss.getStuNo(), ssd.getStuNo())) {
-                        i = 1;
-                        break;
-                    }
-                }
-                if (i == 0) {
+
+                boolean isValidStudent = srsStudentList.stream()
+                        .anyMatch(student -> Objects.equals(scss.getStuNo(), student.getStuNo()));
+
+                if (!isValidStudent) {
                     error.append(scss.getStuNo()).append(",");
                 }
             }
+
             if (!error.toString().equals("")) {
                 throw new RuntimeException("表中的学号：" + error + "不是所带的学生，请删除后再尝试导入！");
             }
         }
-        //TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//标记为回滚状态
-        for (SrsCeScoreStudent i:srsCeScoreStudents){
-            //综合评价成绩
-            SrsCeScore srsCeScore1 = new SrsCeScore();//综合评价
-            SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(i.getStuNo());//查询学生信息
-            srsCeScore1.setStuId(srsStudent.getStuId());//学生id
-            srsCeScore1.setStuYearId(i.getStuYearId());//学年id
-            List<SrsCeScore> srsCeScores = srsCeScoreMapper.selectSrsCeScoreListS(srsCeScore1);//查询综合评价表重复
-            srsCeScore1.setCeScore(i.getCeScore());
-            srsCeScore1.setStuNo(i.getStuNo());
-            if (srsCeScores.size()==0){//判断综合评价表有没有重复的值
-                srsCeScore1.setCreateBy(getUsername());
-                srsCeScore1.setCreateTime(DateUtils.getNowDate());
-                srsCeScoreMapper.insertSrsCeScore(srsCeScore1);//没有则添加
-                //ifSrsAdd(srsAddRecord,srsAddRecords);
-                number++;
-                continue;
-            }
-            srsCeScore1.setUpdateBy(getUsername());
-            srsCeScore1.setUpdateTime(DateUtils.getNowDate());
-            srsCeScore1.setId(srsCeScores.get(0).getId());
-            srsCeScoreMapper.updateSrsCeScore(srsCeScore1);//有则修改
-            //ifSrsAdd(srsAddRecord,srsAddRecords);
-            number++;
+
+        // 分批处理数据，减少事务持有时间
+        int batchSize = 50; // 批处理大小
+        for (int i = 0; i < srsCeScoreStudents.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, srsCeScoreStudents.size());
+            List<SrsCeScoreStudent> batch = srsCeScoreStudents.subList(i, endIndex);
+
+            // 在新的事务中处理每批数据
+            number += processBatch(batch);
         }
-        TransactionAspectSupport.currentTransactionStatus().flush();//手动提交事务
-        //cphTotalScoreMapper.testFor(id);
-        cphTestForService.testMethod(Math.toIntExact(srsCeScoreStudents.get(0).getStuYearId()));
+
+        // 处理完成后调用测试方法
+//        if (!srsCeScoreStudents.isEmpty()) {
+//            cphTestForService.testMethod(Math.toIntExact(srsCeScoreStudents.get(0).getStuYearId()));
+//        }
+
         return number;
     }
+
+    // 新增批处理方法
+    @Transactional(rollbackFor = Exception.class)
+    public int processBatch(List<SrsCeScoreStudent> batch) {
+        int count = 0;
+
+        for (SrsCeScoreStudent i : batch) {
+            // 综合评价成绩
+            SrsCeScore srsCeScore1 = new SrsCeScore();
+            SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(i.getStuNo());
+            srsCeScore1.setStuId(srsStudent.getStuId());
+            srsCeScore1.setStuYearId(i.getStuYearId());
+
+            List<SrsCeScore> srsCeScores = srsCeScoreMapper.selectSrsCeScoreListS(srsCeScore1);
+            srsCeScore1.setCeScore(i.getCeScore());
+            srsCeScore1.setStuNo(i.getStuNo());
+
+            if (srsCeScores.isEmpty()) {
+                srsCeScore1.setCreateBy(getUsername());
+                srsCeScore1.setCreateTime(DateUtils.getNowDate());
+                srsCeScoreMapper.insertSrsCeScore(srsCeScore1);
+            } else {
+                srsCeScore1.setUpdateBy(getUsername());
+                srsCeScore1.setUpdateTime(DateUtils.getNowDate());
+                srsCeScore1.setId(srsCeScores.get(0).getId());
+                srsCeScoreMapper.updateSrsCeScore(srsCeScore1);
+            }
+            count++;
+        }
+
+        return count;
+    }
+
     private void ifSrsAdd(SrsAddRecord srsAddRecord, List<SrsAddRecord> srsAddRecords){
         if (srsAddRecords.size()==0){
             //添加

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java

@@ -156,7 +156,7 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
     //同步专业
     @Override
     public void sqlserverSynchronousMYSQL(List<Map> list) {
-        List<SrsMajors> srsMajors = srsMajorsMapper.selectSrsmajorsList();//专业列表
+        List<SrsMajors> srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表
         //查找重复值
         List<Map> updateMap = list.stream()
                 .filter(obj1 -> srsMajors
@@ -195,22 +195,9 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
             }
             srsMajors1.setStatus("0");
 
-//            Object zydmobj2=map.get("zydm");
-//            if (zydmobj2!=null) {
-//                //科室号查询学院id
-//                String ksh = selectClassSpecialty(zydmobj2.toString());;
-//                if (ksh!=null){
-//                    Long deptId = cphTeacherMapper.selectDeptCode(ksh);
-//                    if (deptId!=null){
-//                        srsMajors1.setCollegeId(deptId);
-//                    }
-//                }else {
-//                    srsMajors1.setCollegeId(0L);//学院id/科室号
-//                }
-//            }
-            if (map.get("yxdm")!=null) {
+            if (map.get("yxmc")!=null) {
                 //使用代码查询学院id
-                Long yxdm = srsMajorsMapper.selectXYID(map.get("yxdm").toString());
+                Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString());
                 if (yxdm!=null) {
                     srsMajors1.setCollegeId(yxdm);//学院id
                 }else {
@@ -234,22 +221,10 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
             if (zymcobj!=null) {
                 srsMajors1.setMajorName(zymcobj.toString());
             }
-//            Object zydmobj2=map.get("zydm");
-//            if (zydmobj2!=null) {
-//                //科室号查询学院id
-//                String ksh = selectClassSpecialty(zydmobj2.toString());;
-//                if (ksh!=null){
-//                    Long deptId = cphTeacherMapper.selectDeptCode(ksh);
-//                    if (deptId!=null){
-//                        srsMajors1.setCollegeId(deptId);
-//                    }
-//                }else {
-//                    srsMajors1.setCollegeId(0L);//学院id/科室号
-//                }
-//            }
-            if (map.get("yxdm")!=null) {
+
+            if (map.get("yxmc")!=null) {
                 //使用代码查询学院id
-                Long yxdm = srsMajorsMapper.selectXYID(map.get("yxdm").toString());
+                Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString());
                 if (yxdm!=null) {
                     srsMajors1.setCollegeId(yxdm);//学院id
                 }else {
@@ -267,7 +242,7 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
         List<List<SrsMajors>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
         if (lists != null) {
             for (List<SrsMajors> studentList:lists){
-                // srsMajorsMapper.updateSrsStudentList(studentList); // 20240822 专业同步只新增不修改
+                 srsMajorsMapper.updateSrsStudentList(studentList);
             }
         }
     }

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsSportTestServiceImpl.java

@@ -81,7 +81,7 @@ public class SrsSportTestServiceImpl  extends ServiceImpl<SrsSportTestMapper,Srs
                 temp.setCreateTime(new Date());
                 int res = srsSportTestMapper.insertSrsSportTest(temp);
                 if(res == 1){
-                    cphTestForService.testMethod(Integer.parseInt(param.getStuYearId().toString()));
+//                    cphTestForService.testMethod(Integer.parseInt(param.getStuYearId().toString()));
                     return AjaxResult.success();
                 }else{
                     throw new Exception("添加成绩失败");
@@ -91,7 +91,7 @@ public class SrsSportTestServiceImpl  extends ServiceImpl<SrsSportTestMapper,Srs
                 temp.setTestScore(param.getTestScore());
                 int res = srsSportTestMapper.updateSrsSportTest(temp);
                 if(res == 1){
-                    cphTestForService.testMethod(Integer.parseInt(param.getStuYearId().toString()));
+//                    cphTestForService.testMethod(Integer.parseInt(param.getStuYearId().toString()));
                     return AjaxResult.success();
                 }else{
                     throw new Exception("修改成绩失败");

srs-comprehensive/src/main/resources/mapper/comprehensive/CphTeacherMapper.xml

@@ -175,16 +175,14 @@
                b.stu_year_name,
                a.ce_score as score,
                a.stu_no,
-               e.`name`   as stu_name,
-               e.`status`,
+               c.stu_name,
+               c.`status`,
                c.class_name
-        from cph_total_score as a
+        from srs_ce_score as a
                  left join srs_stu_year as b on a.stu_year_id = b.id
-                 left join srs_class as c on a.class_code = c.class_code
-                 left join cph_teacher as d on c.teacher_id = d.teacher_id
-                 left join srs_student as e on a.stu_no = e.stu_no
-        where d.employee_id = #{tno}
-        ORDER BY a.class_id asc, b.stu_year_name desc, a.stu_no asc
+                 left join view_stu_info as c on a.stu_no = c.stu_no
+        where c.t_no = #{tno}
+        ORDER BY c.class_id asc, b.stu_year_name desc, a.stu_no asc
     </select>
 
     <select id="listSport" resultType="com.srs.comprehensive.domain.Vo.CphTeacherLookScore">

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml

@@ -1,88 +1,103 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.SrsCeScoreMapper">
-    
+
     <resultMap type="SrsCeScore" id="SrsCeScoreResult">
-        <result property="id"    column="id"    />
-        <result property="stuId"    column="stu_id"    />
-        <result property="stuYearId"    column="stu_year_id"    />
-        <result property="ceScore"    column="ce_score"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="stuNo"    column="stu_no"    />
-        <association property="student" javaType="SrsStudent" resultMap="studentJoin" />
+        <result property="id" column="id"/>
+        <result property="stuId" column="stu_id"/>
+        <result property="stuYearId" column="stu_year_id"/>
+        <result property="ceScore" column="ce_score"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="stuNo" column="stu_no"/>
+        <association property="student" javaType="SrsStudent" resultMap="studentJoin"/>
     </resultMap>
 
     <resultMap type="SrsCeScoreStudentStuYear" id="SrsCeScoreStudentStuYearS">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="stuNo"    column="stu_no"    />
-        <result property="stuYearName"    column="stu_year_name"    />
-        <result property="ceScore"    column="ce_score"    />
-        <result property="stuId"    column="stu_id"    />
-        <result property="stuYearId"    column="stu_year_id"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="stuYearName" column="stu_year_name"/>
+        <result property="ceScore" column="ce_score"/>
+        <result property="stuId" column="stu_id"/>
+        <result property="stuYearId" column="stu_year_id"/>
     </resultMap>
     <resultMap type="SrsStudent" id="studentJoin">
-        <result property="stuId"    column="stu_id"    />
-        <result property="name"    column="name"    />
-        <result property="stuNo"    column="stu_no"    />
-        <result property="gender"    column="gender"    />
-        <result property="birthday"    column="birthday"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="majorId"    column="major_id"    />
-        <result property="phone"    column="phone"    />
-        <result property="address"    column="address"    />
-        <result property="status"    column="status"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
+        <result property="stuId" column="stu_id"/>
+        <result property="name" column="name"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="idCard" column="id_card"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
     <sql id="selectSrsCeScoreVo">
-        select scs.id, scs.stu_id, scs.stu_year_id, scs.ce_score, scs.del_flag, scs.create_by, scs.create_time, scs.update_by,
+        select scs.id,
+               scs.stu_id,
+               scs.stu_year_id,
+               scs.ce_score,
+               scs.del_flag,
+               scs.create_by,
+               scs.create_time,
+               scs.update_by,
                scs.update_time
         from srs_ce_score scs
-        left join srs_student stu on stu.stu_id = scs.stu_id
+                 left join srs_student stu on stu.stu_id = scs.stu_id
     </sql>
 
     <select id="selectSrsCeScoreList" parameterType="SrsCeScore" resultMap="SrsCeScoreResult">
         <include refid="selectSrsCeScoreVo"/>
-        <where>  
-            <if test="stuId != null "> and stu_id = #{stuId}</if>
-            <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
-            <if test="ceScore != null "> and ce_score = #{ceScore}</if>
-            <if test="student.classId != null "> and stu.class_id = #{student.classId}</if>
-            <if test="student.stuNo != null and student.stuNo!=''"> and stu.stu_no = #{student.stuNo}</if>
-            <if test="student.name != null "> and stu.name like #{student.name}</if>
+        <where>
+            <if test="stuId != null ">and stu_id = #{stuId}</if>
+            <if test="stuYearId != null ">and stu_year_id = #{stuYearId}</if>
+            <if test="ceScore != null ">and ce_score = #{ceScore}</if>
+            <if test="student.classId != null ">and stu.class_id = #{student.classId}</if>
+            <if test="student.stuNo != null and student.stuNo!=''">and stu.stu_no = #{student.stuNo}</if>
+            <if test="student.name != null ">and stu.name like #{student.name}</if>
         </where>
     </select>
 
     <sql id="selectSrsCeScoreVoS">
-        select id, stu_id, stu_year_id, ce_score, del_flag, create_by, create_time, update_by, update_time
+        select id,
+               stu_id,
+               stu_year_id,
+               ce_score,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
         from srs_ce_score
     </sql>
     <select id="selectSrsCeScoreListS" parameterType="SrsCeScore" resultMap="SrsCeScoreResult">
         <include refid="selectSrsCeScoreVoS"/>
         <where>
-            <if test="stuId != null "> and stu_id = #{stuId}</if>
-            <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
-            <if test="ceScore != null "> and ce_score = #{ceScore}</if>
+            <if test="stuId != null ">and stu_id = #{stuId}</if>
+            <if test="stuYearId != null ">and stu_year_id = #{stuYearId}</if>
+            <if test="ceScore != null ">and ce_score = #{ceScore}</if>
         </where>
     </select>
-    
+
     <select id="selectSrsCeScoreById" parameterType="Long" resultMap="SrsCeScoreResult">
         <include refid="selectSrsCeScoreVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSrsCeScore" parameterType="SrsCeScore" useGeneratedKeys="true" keyProperty="id">
         insert into srs_ce_score
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -95,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="stuNo != null">stu_no</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stuId != null">#{stuId},</if>
             <if test="stuYearId != null">#{stuYearId},</if>
@@ -106,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="stuNo != null">#{stuNo}</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSrsCeScore" parameterType="SrsCeScore">
@@ -124,12 +139,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+
+
     <delete id="deleteSrsCeScoreById" parameterType="Long">
-        delete from srs_ce_score where id = #{id}
+        delete
+        from srs_ce_score
+        where id = #{id}
     </delete>
 
     <delete id="deleteSrsCeScoreByIds" parameterType="String">
-        delete from srs_ce_score where id in 
+        delete from srs_ce_score where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -137,16 +157,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--    综合评价连表查询-->
     <select id="SrsCeScoreStudentStuYear" parameterType="SrsCeScore" resultMap="SrsCeScoreStudentStuYearS">
         select a.id,b.`name`,b.stu_no,c.stu_year_name,a.ce_score,a.stu_id,a.stu_year_id from srs_ce_score as a
-        left join srs_student as b on  a.stu_id = b.stu_id
+        left join srs_student as b on a.stu_id = b.stu_id
         left join srs_stu_year as c on a.stu_year_id = c.id
         <where>
-            <if test="delFlag != null "> and a.del_flag = #{delFlag}</if>
-            <if test="stuId != null "> and a.stu_id = #{stuId}</if>
-            <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
-            <if test="ceScore != null "> and ce_score = #{ceScore}</if>
-            <if test="student.classId != null "> and b.class_id = #{student.classId}</if>
-            <if test="student.stuNo != null and student.stuNo!=''"> and b.stu_no = #{student.stuNo}</if>
-            <if test="student.name != null "> and b.name like #{student.name}</if>
+            <if test="delFlag != null ">and a.del_flag = #{delFlag}</if>
+            <if test="stuId != null ">and a.stu_id = #{stuId}</if>
+            <if test="stuYearId != null ">and stu_year_id = #{stuYearId}</if>
+            <if test="ceScore != null ">and ce_score = #{ceScore}</if>
+            <if test="student.classId != null ">and b.class_id = #{student.classId}</if>
+            <if test="student.stuNo != null and student.stuNo!=''">and b.stu_no = #{student.stuNo}</if>
+            <if test="student.name != null ">and b.name like #{student.name}</if>
         </where>
     </select>
-</mapper>
+</mapper>

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml

@@ -169,4 +169,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{majorId}
         </foreach>
     </delete>
+
+    <select id="selectOldDeptIdByDeptName" resultType="Long">
+        select b.dept_id
+        from sys_dept_map as a
+                 left join sys_dept as b on a.old_dept_id = b.dept_id
+        where b.dept_name = #{deptName}
+    </select>
 </mapper>

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml

@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.SrsStudentMapper">
 
     <resultMap type="SrsStudent" id="SrsStudentResult">
-        <result property="stuId"    column="stu_id"    />
-        <result property="name"    column="name"    />
-        <result property="stuNo"    column="stu_no"    />
-        <result property="gender"    column="gender"    />
-        <result property="birthday"    column="birthday"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="majorId"    column="major_id"    />
-        <result property="classId"    column="class_id"    />
-        <result property="phone"    column="phone"    />
-        <result property="address"    column="address"    />
-        <result property="status"    column="status"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="xhk"    column="xhk"    />
-        <result property="bankAddr"    column="bank_addr"    />
-        <result property="teacherId"    column="teacher_id"    />
-        <result property="cphName" column="cphName"  />
-        <result property="gradeName" column="grade_name" />
-        <result property="status2" column="status2" />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-        <association property="srsMajors"    column="major_id" javaType="srsMajors" resultMap="SrsMajorsResult" />
-        <association property="srsClass"    column="class_id" javaType="srsClass" resultMap="SrsClassResult" />
-        <association property="cphTeacher"    column="teacher_id" javaType="cphTeacher" resultMap="CphTeacherResult" />
-        <association property="cphStuExtraInfo"    column="stu_no" javaType="cphStuExtraInfo" resultMap="CphStuExtraInfoResult" />
+        <result property="stuId" column="stu_id"/>
+        <result property="name" column="name"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="idCard" column="id_card"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="classId" column="class_id"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="xhk" column="xhk"/>
+        <result property="bankAddr" column="bank_addr"/>
+        <result property="teacherId" column="teacher_id"/>
+        <result property="cphName" column="cphName"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="status2" column="status2"/>
+        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
+        <association property="srsMajors" column="major_id" javaType="srsMajors" resultMap="SrsMajorsResult"/>
+        <association property="srsClass" column="class_id" javaType="srsClass" resultMap="SrsClassResult"/>
+        <association property="cphTeacher" column="teacher_id" javaType="cphTeacher" resultMap="CphTeacherResult"/>
+        <association property="cphStuExtraInfo" column="stu_no" javaType="cphStuExtraInfo"
+                     resultMap="CphStuExtraInfoResult"/>
     </resultMap>
     <resultMap id="CphStuExtraInfoResult" type="CphStuExtraInfo">
         <result property="stuNo" column="stu_no"/>
@@ -46,106 +47,152 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name" column="name"/>
     </resultMap>
     <resultMap type="SrsGrade" id="SrsGradeResult">
-        <result property="gradeId"    column="grade_id"    />
-        <result property="gradeName"    column="grade_name"    />
+        <result property="gradeId" column="grade_id"/>
+        <result property="gradeName" column="grade_name"/>
     </resultMap>
     <resultMap type="SrsClass" id="SrsClassResult">
-        <result property="classId"    column="class_id"    />
-        <result property="majorId"    column="major_id"    />
-        <result property="className"    column="class_name"    />
+        <result property="classId" column="class_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="className" column="class_name"/>
     </resultMap>
     <resultMap type="SrsMajors" id="SrsMajorsResult">
-        <result property="majorId"    column="major_id"    />
-        <result property="majorName"    column="major_name"    />
-        <result property="collegeId"    column="college_id"    />
-        <result property="majorDescription"    column="major_description"    />
+        <result property="majorId" column="major_id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="collegeId" column="college_id"/>
+        <result property="majorDescription" column="major_description"/>
     </resultMap>
     <resultMap id="deptResult" type="SysDept">
-        <id     property="deptId"    column="dept_id"     />
-        <result property="parentId"  column="parent_id"   />
-        <result property="deptName"  column="dept_name"   />
-        <result property="ancestors" column="ancestors"   />
-        <result property="orderNum"  column="order_num"   />
-        <result property="leader"    column="leader"      />
-        <result property="status"    column="dept_status" />
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
     </resultMap>
 
     <resultMap id="studentName" type="CascaderEntity">
-        <id     property="value"    column="stu_id"     />
-        <result property="label"  column="name"   />
+        <id property="value" column="stu_id"/>
+        <result property="label" column="name"/>
     </resultMap>
 
 
     <sql id="selectSrsStudentVo">
-        select s.stu_id,s.stu_no, s.name, s.gender, s.birthday, AES_DECRYPT(UNHEX(s.id_card),'zhxg') as id_card , s.dept_id, major_id, class_id, s.phone, s.address,
-               s.status, s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag,s.xhk,s.bank_addr
+        select s.stu_id,
+               s.stu_no,
+               s.name,
+               s.gender,
+               s.birthday,
+               AES_DECRYPT(UNHEX(s.id_card), 'zhxg') as id_card,
+               s.dept_id,
+               major_id,
+               class_id,
+               s.phone,
+               s.address,
+               s.status,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               s.del_flag,
+               s.xhk,
+               s.bank_addr
         from srs_student s
 
     </sql>
     <sql id="selectSrsStudentJoin">
-        select s.stu_id,s.stu_no, s.name, s.gender, s.birthday,AES_DECRYPT(UNHEX(s.id_card),'zhxg') as id_card , d.dept_id, m.major_id, c.class_id, s.phone, s.address,
-               s.status, s.status as status2,s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag,s.xhk,s.bank_addr,e.name as cphName,f.grade_name,
-               d.*,m.*,c.*,g.*
+        select s.stu_id,
+               s.stu_no,
+               s.name,
+               s.gender,
+               s.birthday,
+               AES_DECRYPT(UNHEX(s.id_card), 'zhxg') as id_card,
+               d.dept_id,
+               m.major_id,
+               c.class_id,
+               s.phone,
+               s.address,
+               s.status,
+               s.status                              as status2,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               s.del_flag,
+               s.xhk,
+               s.bank_addr,
+               e.name                                as cphName,
+               f.grade_name,
+               d.*,
+               m.*,
+               c.*,
+               g.*
         from srs_student s
                  left JOIN srs_class c ON s.class_id = c.class_id
                  left JOIN srs_majors m ON c.major_id = m.major_id
                  left JOIN sys_dept d ON m.college_id = d.dept_id
                  left join cph_teacher as e on c.teacher_id = e.teacher_id
-                 left join srs_grade as f on f.grade_id=c.grade_id
-                 left join cph_stu_extra_info g on g.stu_no=s.stu_no
+                 left join srs_grade as f on f.grade_id = c.grade_id
+                 left join cph_stu_extra_info g on g.stu_no = s.stu_no
     </sql>
     <select id="selectSrsStudentList" parameterType="SrsStudent" resultMap="SrsStudentResult">
         <include refid="selectSrsStudentVo"/>
         <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
-            <if test="birthday != null "> and birthday = #{birthday}</if>
-            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="majorId != null "> and major_id = #{majorId}</if>
-            <if test="classId != null "> and class_id = #{classId}</if>
-            <if test="phone != null  and phone != ''"> and phone like concat('%',  #{phone}  , '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%',  #{address} , '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="gender != null  and gender != ''">and gender = #{gender}</if>
+            <if test="birthday != null ">and birthday = #{birthday}</if>
+            <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="majorId != null ">and major_id = #{majorId}</if>
+            <if test="classId != null ">and class_id = #{classId}</if>
+            <if test="phone != null  and phone != ''">and phone like concat('%', #{phone} , '%')</if>
+            <if test="address != null  and address != ''">and address like concat('%', #{address} , '%')</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
         </where>
     </select>
     <select id="selectSrsStudentNameList" parameterType="Long" resultMap="studentName">
-        select  stu_id,name from srs_student where class_id = #{id}
+        select stu_id, name
+        from srs_student
+        where class_id = #{id}
     </select>
 
     <select id="selectSrsStudentListJoin" parameterType="SrsStudent" resultMap="SrsStudentResult">
         <include refid="selectSrsStudentJoin"/>
         <where>
-            <if test="stuNo != null  and stuNo != ''"> and s.stu_no like concat('%', #{stuNo}, '%')</if>
-            <if test="name != null  and name != ''"> and s.name like concat('%', #{name}, '%')</if>
-            <if test="gender != null  and gender != ''"> and s.gender = #{gender}</if>
-            <if test="birthday != null "> and s.birthday = #{birthday}</if>
-            <if test="idCard != null  and idCard != ''"> and s.id_card = #{idCard}</if>
-            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
-            <if test="majorId != null "> and m.major_id = #{majorId}</if>
-            <if test="classId != null "> and s.class_id = #{classId}</if>
-            <if test="phone != null  and phone != ''"> and s.phone like concat('%',  #{phone}  , '%')</if>
-            <if test="address != null  and address != ''"> and s.address like concat('%',  #{address} , '%')</if>
-            <if test="status != null  and status != ''"> and s.status = #{status}</if>
-            <if test="tNo != null  and tNo != ''"> and e.employee_id = #{tNo}</if>
-            <if test="gradeId != null"> and c.grade_id = #{gradeId}</if>
-            <if test="cphName != null and cphName!=''"> and e.name = #{cphName}</if>
+            <if test="stuNo != null  and stuNo != ''">and s.stu_no like concat('%', #{stuNo}, '%')</if>
+            <if test="name != null  and name != ''">and s.name like concat('%', #{name}, '%')</if>
+            <if test="gender != null  and gender != ''">and s.gender = #{gender}</if>
+            <if test="birthday != null ">and s.birthday = #{birthday}</if>
+            <if test="idCard != null  and idCard != ''">and s.id_card = #{idCard}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="majorId != null ">and m.major_id = #{majorId}</if>
+            <if test="classId != null ">and s.class_id = #{classId}</if>
+            <if test="phone != null  and phone != ''">and s.phone like concat('%', #{phone} , '%')</if>
+            <if test="address != null  and address != ''">and s.address like concat('%', #{address} , '%')</if>
+            <if test="status != null  and status != ''">and s.status = #{status}</if>
+            <if test="tNo != null  and tNo != ''">and e.employee_id = #{tNo}</if>
+            <if test="gradeId != null">and c.grade_id = #{gradeId}</if>
+            <if test="cphName != null and cphName!=''">and e.name = #{cphName}</if>
         </where>
         order by s.stu_no desc
     </select>
 
-    <select id="getOwnClass" resultType="com.srs.comprehensive.domain.Vo.StuClass" >
-        select a.stu_no,a.`name` as stu_name,b.class_name from srs_student as a
-        left join srs_class as b on a.class_id = b.class_id
+    <select id="getOwnClass" resultType="com.srs.comprehensive.domain.Vo.StuClass">
+        select a.stu_no, a.`name` as stu_name, b.class_name
+        from srs_student as a
+                 left join srs_class as b on a.class_id = b.class_id
         where a.stu_no = #{stuNo}
     </select>
 
     <select id="listEnableStu" resultType="SrsStudent">
-        select * from srs_student where `status` = '01'
+        select *
+        from srs_student
+        where `status` = '01'
     </select>
 
     <select id="selectStuNoNameByClass" resultType="com.srs.comprehensive.domain.Vo.StuNoName">
-        select stu_no,`name` as stu_name from srs_student
+        select stu_no, `name` as stu_name
+        from srs_student
         where class_id = #{id}
     </select>
 
@@ -158,7 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where stu_no = #{stuNo}
     </select>
     <select id="selectClassId" resultType="java.lang.Long">
-        select class_id from srs_class where class_code=#{bjdm}
+        select class_id
+        from srs_class
+        where class_code = #{bjdm}
     </select>
     <insert id="insertSrsStudent" parameterType="SrsStudent" useGeneratedKeys="true" keyProperty="stuId">
         insert into srs_student
@@ -181,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="roomId != null">room_id,</if>
 
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
             <if test="stuNo != null">#{stuNo},</if>
@@ -200,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="roomId != null">#{roomId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSrsStudent" parameterType="SrsStudent">
@@ -228,7 +277,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSrsStudentByStuId" parameterType="Long">
-        delete from srs_student where stu_id = #{stuId}
+        delete
+        from srs_student
+        where stu_id = #{stuId}
     </delete>
 
     <delete id="deleteSrsStudentByStuIds" parameterType="String">
@@ -249,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE stu_no = #{student.stuNo}
         </foreach>
     </update>
-<!--    批量更新代码-->
+    <!--    批量更新代码-->
     <update id="updateSrsStudentList" parameterType="java.util.List">
         update srs_student
         <trim prefix="set" suffixOverrides=",">
@@ -333,42 +384,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="countDeptGradeStu" resultType="StuCount">
-        select count(a.stu_no) as stu_count,
+        select count(a.stu_no)           as stu_count,
                case a.dept_name is NULL
                    when true then "无学院"
-                   else a.dept_name end as dept_name,
+                   else a.dept_name end  as dept_name,
                case a.grade_name is NULL
                    when true then "无年级"
                    else a.grade_name end as grade_name
         from view_stu_info as a
-        where a.`status` = "01" and a.grade_name is not NULL
-             and a.dept_name is not NULL
-        GROUP BY a.dept_id,a.grade_id
+        where a.`status` = "01"
+          and a.grade_name is not NULL
+          and a.dept_name is not NULL
+        GROUP BY a.dept_id, a.grade_id
         order by a.dept_id
     </select>
 
     <select id="countDeptStu" resultType="StuCount">
-        select count(a.stu_no) as stu_count,
+        select count(a.stu_no)          as stu_count,
                case a.dept_name is null
                    when true then "无学院"
                    else a.dept_name end as dept_name
         from view_stu_info as a
-        where a.`status` = "01" and a.dept_name is not null
+        where a.`status` = "01"
+          and a.dept_name is not null
         GROUP BY a.dept_id
         order by a.dept_id
     </select>
 
 
-    <select id="countGoodBiyeGradeStu"  resultType="StuCount">
-        select count(a.stu_no) as stu_count,b.grade_name
+    <select id="countGoodBiyeGradeStu" resultType="StuCount">
+        select count(a.stu_no) as stu_count, b.grade_name
         from cph_biye_apply as a
                  left join view_stu_info as b on a.stu_no = b.stu_no
         where a.apply_status = 6
         GROUP BY b.grade_id
     </select>
 
-    <select id="countGoodGradeStu" resultType="StuCount" >
-        select count(a.stu_no) as stu_count,
+    <select id="countGoodGradeStu" resultType="StuCount">
+        select count(a.stu_no)           as stu_count,
                case b.grade_name is null
                    when true then "无年级"
                    else b.grade_name end as grade_name,
@@ -380,8 +433,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by b.grade_id
     </select>
 
-    <select id="countLakeGradeStu" resultType="StuCount" >
-        select count(a.stu_no) as stu_count,
+    <select id="selectSrsStudentByClassIds" parameterType="list" resultType="SrsStudent">
+        SELECT * FROM srs_student
+        WHERE class_id IN
+        <foreach item="classId" collection="classIds" open="(" separator="," close=")">
+            #{classId}
+        </foreach>
+        AND del_flag = '0'
+    </select>
+
+    <select id="countLakeGradeStu" resultType="StuCount">
+        select count(a.stu_no)           as stu_count,
                case b.grade_name is null
                    when true then "无年级"
                    else b.grade_name end as grade_name
@@ -391,120 +453,130 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by b.grade_id
     </select>
 
-    <select id="countParkStu" resultType="StuCount" >
-        select sum(b.occupancy) as all_in,a.park_name,a.campus_name,sum(a.bed_num) as `all`,
-               (
-                   select count(t1.stu_no) from view_stu_info as t1 where t1.`status` = '01'
-               ) as stu_count
+    <select id="countParkStu" resultType="StuCount">
+        select sum(b.occupancy)                                                            as all_in,
+               a.park_name,
+               a.campus_name,
+               sum(a.bed_num)                                                              as `all`,
+               (select count(t1.stu_no) from view_stu_info as t1 where t1.`status` = '01') as stu_count
         from view_dorm_info as a
                  left join view_dorm_stu_count as b on a.id = b.dormitory_id
         GROUP BY a.park_id
     </select>
 
     <select id="selectDeptLeveaDataCount" resultType="com.srs.comprehensive.domain.Vo.DeptLeaveDataVo">
-        SELECT
-            c.dept_id AS deptId,
-            h.grade_name AS gradeName,
-            c.dept_name AS departmentName,
-            COUNT(CASE WHEN a.status = '1' THEN 1 END) leaveCount
+        SELECT c.dept_id    AS                            deptId,
+               h.grade_name AS                            gradeName,
+               c.dept_name  AS                            departmentName,
+               COUNT(CASE WHEN a.status = '1' THEN 1 END) leaveCount
         FROM rt_stu_leave_application a
-                 LEFT JOIN srs_student b ON a.stu_id=b.stu_id
+                 LEFT JOIN srs_student b ON a.stu_id = b.stu_id
                  LEFT JOIN srs_class e ON b.class_id = e.class_id
                  LEFT JOIN srs_majors d ON e.major_id = d.major_id
                  LEFT JOIN sys_dept c ON d.college_id = c.dept_id
                  LEFT JOIN srs_grade h ON e.grade_id = h.grade_id
-        GROUP BY c.dept_id,h.grade_name,c.dept_name
+        GROUP BY c.dept_id, h.grade_name, c.dept_name
     </select>
     <select id="selectStuQuitSchoolCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
-            department_Name deptName,
-            COUNT(*) AS number
-        FROM
-            rt_stu_quit_school
-        WHERE
-            apply_status = 1
-        GROUP BY
-            department_Name
+        SELECT department_Name deptName,
+               COUNT(*) AS     number
+        FROM rt_stu_quit_school
+        WHERE apply_status = 1
+        GROUP BY department_Name
     </select>
 
     <select id="selectStuPunishCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
-            department_Name AS deptName,
-            COUNT(*) AS number
-        FROM
-            rt_stu_disciplinary_application
-        WHERE
-            penalty_status = 0
-        GROUP BY
-            department_Name
+        SELECT department_Name AS deptName,
+               COUNT(*)        AS number
+        FROM rt_stu_disciplinary_application
+        WHERE penalty_status = 0
+        GROUP BY department_Name
     </select>
 
     <select id="selectKnrdCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT xy AS deptName, COUNT(id) AS number FROM `srs_knrd_apply`
-        where  stu_year_id in (SELECT id FROM srs_stu_year WHERE `status`=1)  and step >= 5 and xsqmyj !=4  group by  xy
+        SELECT xy AS deptName, COUNT(id) AS number
+        FROM `srs_knrd_apply`
+        where stu_year_id in (SELECT id FROM srs_stu_year WHERE `status` = 1)
+          and step >= 5
+          and xsqmyj !=4
+        group by xy
     </select>
 
     <select id="selectZxjCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT xy AS deptName, COUNT(id) AS number FROM `srs_zxj_apply`
-        where  stu_year_id in  (SELECT id FROM srs_stu_year WHERE `status`=1)  and step =4  group by  xy
+        SELECT xy AS deptName, COUNT(id) AS number
+        FROM `srs_zxj_apply`
+        where stu_year_id in (SELECT id FROM srs_stu_year WHERE `status` = 1)
+          and step = 4
+        group by xy
     </select>
 
     <select id="selectDeptCountByCampusLJ" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT  a.dept_name deptName,count(*) number  FROM view_stu_info a
-       INNER JOIN srs_grade b ON a.grade_code = b.grade_code
-        WHERE b.grade_status in (1,3) AND dept_name in ('自动化工程学院','水利工程学院','电力工程学院','水利工程学院','土木建筑工程学院','机电工程学院','交通工程学院','合作分校')
+        SELECT a.dept_name deptName, count(*) number
+        FROM view_stu_info a
+                 INNER JOIN srs_grade b ON a.grade_code = b.grade_code
+        WHERE b.grade_status in (1, 3)
+          AND dept_name in
+              ('自动化工程学院', '水利工程学院', '电力工程学院', '水利工程学院', '土木建筑工程学院', '机电工程学院',
+               '交通工程学院', '合作分校')
         GROUP BY dept_name
     </select>
     <select id="selectDeptCountByCampusCG" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT  a.dept_name deptName,count(*) number  FROM view_stu_info a
-       INNER JOIN srs_grade b ON a.grade_code = b.grade_code
-        WHERE b.grade_status in (1,3) AND dept_name in ('信息工程学院','经济管理学院')
+        SELECT a.dept_name deptName, count(*) number
+        FROM view_stu_info a
+                 INNER JOIN srs_grade b ON a.grade_code = b.grade_code
+        WHERE b.grade_status in (1, 3)
+          AND dept_name in ('信息工程学院', '经济管理学院')
         GROUP BY dept_name
     </select>
 
     <select id="selectGradeCount" resultType="com.srs.comprehensive.domain.Vo.GradeStuDataVo">
-        SELECT b.grade_name grade,count(*) number FROM view_stu_info a
-       INNER JOIN srs_grade b ON a.grade_code = b.grade_code
-        WHERE b.grade_status in (1,3)
+        SELECT b.grade_name grade, count(*) number
+        FROM view_stu_info a
+                 INNER JOIN srs_grade b ON a.grade_code = b.grade_code
+        WHERE b.grade_status in (1, 3)
         GROUP BY b.grade_name
     </select>
 
     <select id="countDeptGradeStuNew" resultType="Map">
-        select  a.dept_name,a.grade_name,count(1) as num
+        select a.dept_name, a.grade_name, count(1) as num
         from view_stu_info as a
                  left join srs_grade as b on b.grade_id = a.grade_id
-        where b.grade_status in (1,3) and dept_name is not null and a.`status` = '01'
-        group by a.dept_name,a.grade_name
-        order by dept_name,grade_name
+        where b.grade_status in (1, 3)
+          and dept_name is not null
+          and a.`status` = '01'
+        group by a.dept_name, a.grade_name
+        order by dept_name, grade_name
     </select>
 
     <select id="countMajorStuByDept" resultType="Map" parameterType="CphSearch">
-        select t1.*,t2.major_name,t3.dept_name
-        from
-            (
-                select count(1) as num,a.major_code
-                from view_stu_info as a
-                where a.dept_name = #{deptName} and a.`status` = '01'
-                GROUP BY a.major_code
-            ) as t1
-                left join srs_majors as t2 on t1.major_code = t2.major_code
-                left join sys_dept as t3 on t2.college_id = t3.dept_id
+        select t1.*, t2.major_name, t3.dept_name
+        from (select count(1) as num, a.major_code
+              from view_stu_info as a
+              where a.dept_name = #{deptName}
+                and a.`status` = '01'
+              GROUP BY a.major_code) as t1
+                 left join srs_majors as t2 on t1.major_code = t2.major_code
+                 left join sys_dept as t3 on t2.college_id = t3.dept_id
         order by t1.major_code
     </select>
 
     <select id="countDeptStuNew" resultType="Map">
-        select count(1) as `value`,a.dept_name as `name`
+        select count(1) as `value`, a.dept_name as `name`
         from view_stu_info as a
-        left join srs_grade as b on a.grade_id = b.grade_id
-        where a.`status` = '01' and a.dept_name is not null and grade_status in (1,3)
+                 left join srs_grade as b on a.grade_id = b.grade_id
+        where a.`status` = '01'
+          and a.dept_name is not null
+          and grade_status in (1, 3)
         group by a.dept_name
     </select>
 
     <select id="countGradeStuNew" resultType="Map">
-        select count(1) as `value`,a.grade_name as `name`
+        select count(1) as `value`, a.grade_name as `name`
         from view_stu_info as a
                  left join srs_grade as b on a.grade_id = b.grade_id
-        where a.`status` = '01' and a.grade_name is not null and b.grade_status in (1,3)
+        where a.`status` = '01'
+          and a.grade_name is not null
+          and b.grade_status in (1, 3)
         group by a.grade_name
     </select>
 
@@ -516,185 +588,237 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gradeId != null">and a.grade_id = #{gradeId}</if>
         </where>
     </select>
-    <select id="getRtStuQuitSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuQuitSchoolVo" parameterType="stuDataSelcetDto">
-        select quit_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_type,quit_category,quit_year,process_instance_id,deploy_id from rt_stu_quit_school
+    <select id="getRtStuQuitSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuQuitSchoolVo"
+            parameterType="stuDataSelcetDto">
+        select
+        quit_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_type,quit_category,quit_year,process_instance_id,deploy_id
+        from rt_stu_quit_school
         <where>
             apply_status = 1
-            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName} </if>
-            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo} </if>
-            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName} </if>
+            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName}</if>
+            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo}</if>
+            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName}</if>
         </where>
         order by grade_name,class_name
     </select>
-    <select id="getRtStuDisciplinaryApplication" resultType="com.srs.comprehensive.domain.Vo.RtStuDisciplinaryApplicationVo" parameterType="stuDataSelcetDto">
-        select application_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,penalty_type,process_instance_id,deploy_id  from rt_stu_disciplinary_application
+    <select id="getRtStuDisciplinaryApplication"
+            resultType="com.srs.comprehensive.domain.Vo.RtStuDisciplinaryApplicationVo"
+            parameterType="stuDataSelcetDto">
+        select
+        application_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,penalty_type,process_instance_id,deploy_id
+        from rt_stu_disciplinary_application
         <where>
             penalty_status = 0
-            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName} </if>
-            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo} </if>
-            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName} </if>
+            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName}</if>
+            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo}</if>
+            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName}</if>
         </where>
         order by grade_name,class_name
     </select>
-    <select id="getRtStuDropOutSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuDropOutSchoolVo" parameterType="stuDataSelcetDto">
-        select drop_out_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_year,drop_out_type,drop_out_category,process_instance_id,deploy_id from rt_stu_drop_out_school
+    <select id="getRtStuDropOutSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuDropOutSchoolVo"
+            parameterType="stuDataSelcetDto">
+        select
+        drop_out_school_id,stu_no,stu_name,applicant_name,department_name,grade_name,class_name,jg,mz,quit_year,drop_out_type,drop_out_category,process_instance_id,deploy_id
+        from rt_stu_drop_out_school
         <where>
             apply_status = 1
-            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName} </if>
-            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo} </if>
-            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName} </if>
+            <if test="departmentName != null and departmentName!= '' ">and department_name=#{departmentName}</if>
+            <if test="stuNo != null and stuNo!= '' ">and stu_no=#{stuNo}</if>
+            <if test="stuName != null and stuName!= '' ">and stu_name=#{stuName}</if>
         </where>
         order by grade_name,class_name
     </select>
-    <select id="getSrsKnrdApply" resultType="com.srs.comprehensive.domain.Vo.SrsKnrdApplyVo" parameterType="stuDataSelcetDto">
+    <select id="getSrsKnrdApply" resultType="com.srs.comprehensive.domain.Vo.SrsKnrdApplyVo"
+            parameterType="stuDataSelcetDto">
         select id,xh,xm,xb,mz,hjszd,bj,xy,nj,xsqmyj,apply_year from srs_knrd_apply a
-        where  stu_year_id =  (select id from srs_stu_year where status=1)  and step >= 5 and xsqmyj !=4
-        <if test="departmentName != null and departmentName!= '' ">and xy=#{departmentName} </if>
-        <if test="stuNo != null and stuNo!= '' ">and xh=#{stuNo} </if>
-        <if test="stuName != null and stuName!= '' ">and xm=#{stuName} </if>
+        where stu_year_id = (select id from srs_stu_year where status=1) and step >= 5 and xsqmyj !=4
+        <if test="departmentName != null and departmentName!= '' ">and xy=#{departmentName}</if>
+        <if test="stuNo != null and stuNo!= '' ">and xh=#{stuNo}</if>
+        <if test="stuName != null and stuName!= '' ">and xm=#{stuName}</if>
         order by NJ desc,bj desc
     </select>
-    <select id="getSrsZxjApply" resultType="com.srs.comprehensive.domain.Vo.SrsZxjApplyVo" parameterType="stuDataSelcetDto">
-        select id,xh,xm,xb,mz,dz,bj,xy,nj, kndj,apply_year  from srs_zxj_apply
-        where  stu_year_id =  (select id FROM srs_stu_year where status=1)  and step =4
-        <if test="departmentName != null and departmentName!= '' ">and xy=#{departmentName} </if>
-        <if test="stuNo != null and stuNo!= '' ">and xh=#{stuNo} </if>
-        <if test="stuName != null and stuName!= '' ">and xm=#{stuName} </if>
-            order by NJ desc,bj desc
+    <select id="getSrsZxjApply" resultType="com.srs.comprehensive.domain.Vo.SrsZxjApplyVo"
+            parameterType="stuDataSelcetDto">
+        select id,xh,xm,xb,mz,dz,bj,xy,nj, kndj,apply_year from srs_zxj_apply
+        where stu_year_id = (select id FROM srs_stu_year where status=1) and step =4
+        <if test="departmentName != null and departmentName!= '' ">and xy=#{departmentName}</if>
+        <if test="stuNo != null and stuNo!= '' ">and xh=#{stuNo}</if>
+        <if test="stuName != null and stuName!= '' ">and xm=#{stuName}</if>
+        order by NJ desc,bj desc
     </select>
     <select id="selectStuDropOutSchoolCount"
             resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
-            department_Name AS deptName,
-            COUNT(*) AS number
-        FROM
-            rt_stu_drop_out_school
-        WHERE
-            apply_status = 1
-        GROUP BY
-            department_Name
+        SELECT department_Name AS deptName,
+               COUNT(*)        AS number
+        FROM rt_stu_drop_out_school
+        WHERE apply_status = 1
+        GROUP BY department_Name
     </select>
     <select id="getSrsHZCount" resultType="java.util.Map">
-        select hkxz ,count(1) as quantity  from  cph_stu_extra_info  where hkxz is not null  group by hkxz
+        select hkxz, count(1) as quantity
+        from cph_stu_extra_info
+        where hkxz is not null
+        group by hkxz
     </select>
     <select id="getSrsZZCount" resultType="java.util.Map">
-        select zzmm ,count(1) as quantity  from  cph_stu_extra_info  where zzmm is not null and zzmm in('群众','中共党员','共青团员')  group by zzmm
+        select zzmm, count(1) as quantity
+        from cph_stu_extra_info
+        where zzmm is not null
+          and zzmm in ('群众', '中共党员', '共青团员')
+        group by zzmm
     </select>
     <select id="getSrsGenderCount" resultType="java.util.Map">
-        select gender,count(1) as  quantity from srs_student a left join srs_class b on a.class_id=b.class_id
-        left join srs_grade c on c.grade_id=b.grade_id where c.grade_status in(1,3) and gender is not null   group by gender
+        select gender, count(1) as quantity
+        from srs_student a
+                 left join srs_class b on a.class_id = b.class_id
+                 left join srs_grade c on c.grade_id = b.grade_id
+        where c.grade_status in (1, 3)
+          and gender is not null
+        group by gender
     </select>
     <select id="getSrsknrdCount" resultType="java.util.Map">
-        select  (case
-                     when xsqmyj=1 then'特别困难'
-                     when  xsqmyj=2 then '比较困难'
-                     when  xsqmyj=3 then '一般困难'  end
-                    ) as xsqmyj,count(1) as quantity
-        from srs_knrd_apply  where  stu_year_id in (select id from srs_stu_year where status=1)  and step >= 5 and xsqmyj !=4
+        select (case
+                    when xsqmyj = 1 then '特别困难'
+                    when xsqmyj = 2 then '比较困难'
+                    when xsqmyj = 3 then '一般困难' end
+                   )    as xsqmyj,
+               count(1) as quantity
+        from srs_knrd_apply
+        where stu_year_id in (select id from srs_stu_year where status = 1)
+          and step >= 5
+          and xsqmyj !=4
         group by xsqmyj
     </select>
     <select id="getSrsAgeCount" resultType="java.util.Map">
-        SELECT
-            CASE
-                WHEN FLOOR(YEAR(CURDATE()) - YEAR(birthday)) BETWEEN 0 AND 17 THEN '低于18岁'
-                WHEN FLOOR(YEAR(CURDATE()) - YEAR(birthday)) BETWEEN 18 AND 20 THEN '18岁-20岁'
-                ELSE '超过20岁'
-                END AS age_group,
-            COUNT(1) AS quantity,quantity/sum(quantity)*100 as percen
-        FROM srs_student where birthday is not null
+        SELECT CASE
+                   WHEN FLOOR(YEAR(CURDATE()) - YEAR(birthday)) BETWEEN 0 AND 17 THEN '低于18岁'
+                   WHEN FLOOR(YEAR(CURDATE()) - YEAR(birthday)) BETWEEN 18 AND 20 THEN '18岁-20岁'
+                   ELSE '超过20岁'
+                   END                        AS age_group,
+               COUNT(1)                       AS quantity,
+               quantity / sum(quantity) * 100 as percen
+        FROM srs_student
+        where birthday is not null
         GROUP BY age_group
     </select>
     <select id="countStuMZ" resultType="java.util.Map">
-        select mz ,count(1) as quantity  from  cph_stu_extra_info  where mz is not null group by  mz order by quantity desc limit 4
+        select mz, count(1) as quantity
+        from cph_stu_extra_info
+        where mz is not null
+        group by mz
+        order by quantity desc limit 4
     </select>
     <select id="getCountbyCity" resultType="java.util.Map">
-        select * from (select (case when b.id_card=4501 then '南宁市'
-                                    when b.id_card=4502 then '柳州市'
-                                    when b.id_card=4503 then '桂林市'
-                                    when b.id_card=4504 then '梧州市'
-                                    when b.id_card=4505 then '北海市'
-                                    when b.id_card=4506 then '防城港市'
-                                    when b.id_card=4507 then '钦州市'
-                                    when b.id_card=4508 then '贵港市'
-                                    when b.id_card=4509 then '玉林市'
-                                    when b.id_card=4510 then '百色市'
-                                    when b.id_card=4511 then '贺州市'
-                                    when b.id_card=4512 then '河池市'
-                                    when b.id_card=4513 then '来宾市'
-                                    when b.id_card=4514 then '崇左市'
-                                end) as city,total_count,male_count,female_count
-                             from (select  left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4) as id_card,count(1) as total_count,
-                                 sum(case when gender='男' then 1 else 0 end) as male_count,
-                                 sum(case when gender='女' then 1 else 0 end) as female_count
-                             from srs_student d left join srs_class e on d.class_id=e.class_id
-                                 left join srs_grade f on f.grade_id=e.grade_id
-                             where f.grade_status in (1,3)  GROUP BY left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4)) b) c where c.city is not null;
+        select *
+        from (select (case
+                          when b.id_card = 4501 then '南宁市'
+                          when b.id_card = 4502 then '柳州市'
+                          when b.id_card = 4503 then '桂林市'
+                          when b.id_card = 4504 then '梧州市'
+                          when b.id_card = 4505 then '北海市'
+                          when b.id_card = 4506 then '防城港市'
+                          when b.id_card = 4507 then '钦州市'
+                          when b.id_card = 4508 then '贵港市'
+                          when b.id_card = 4509 then '玉林市'
+                          when b.id_card = 4510 then '百色市'
+                          when b.id_card = 4511 then '贺州市'
+                          when b.id_card = 4512 then '河池市'
+                          when b.id_card = 4513 then '来宾市'
+                          when b.id_card = 4514 then '崇左市'
+            end) as city,
+                     total_count,
+                     male_count,
+                     female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+                    from srs_student d left join srs_class e
+                    on d.class_id=e.class_id
+                        left join srs_grade f on f.grade_id=e.grade_id
+                    where f.grade_status in (1, 3)
+                    GROUP BY left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4)) b) c
+        where c.city is not null;
 
     </select>
     <select id="getSchoolCountbyGrade" resultType="java.util.Map">
-        select c.grade_code,count(1) as number from srs_student a
-         left join srs_class b on a.class_id=b.class_id
-        left join srs_grade c on c.grade_id=b.grade_id
-        where c.grade_status in(1,3) and gender is not null
-        group by c.grade_code order by grade_code desc
+        select c.grade_code, count(1) as number
+        from srs_student a
+                 left join srs_class b on a.class_id = b.class_id
+                 left join srs_grade c on c.grade_id = b.grade_id
+        where c.grade_status in (1, 3)
+          and gender is not null
+        group by c.grade_code
+        order by grade_code desc
     </select>
     <select id="getSchoolTotalCount" resultType="java.util.Map">
-        SELECT
-            COUNT(1) AS TotalCount,
-            SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END) AS NaCount,
-            SUM(CASE WHEN gender = '女' THEN 1 ELSE 0 END) AS NvCount,
-            CONCAT(ROUND(SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2), '%') AS NaZB,
-            CONCAT(ROUND(SUM(CASE WHEN gender = '女' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2), '%') AS NvZB
-        FROM srs_student d left join srs_class e on d.class_id=e.class_id
-            left join srs_grade f on f.grade_id=e.grade_id where f.grade_status in (1,3) and gender is not null
+        SELECT COUNT(1)                                                                               AS TotalCount,
+               SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END)                                         AS NaCount,
+               SUM(CASE WHEN gender = '女' THEN 1 ELSE 0 END)                                         AS NvCount,
+               CONCAT(ROUND(SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2), '%') AS NaZB,
+               CONCAT(ROUND(SUM(CASE WHEN gender = '女' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2), '%') AS NvZB
+        FROM srs_student d
+                 left join srs_class e on d.class_id = e.class_id
+                 left join srs_grade f on f.grade_id = e.grade_id
+        where f.grade_status in (1, 3)
+          and gender is not null
     </select>
     <select id="getNotSchoolTotalCount" resultType="java.util.Map">
-        select sum(total_count) as number from (select (case when b.id_card=4501 then '南宁市'
-                                                             when b.id_card=4502 then '柳州市'
-                                                             when b.id_card=4503 then '桂林市'
-                                                             when b.id_card=4504 then '梧州市'
-                                                             when b.id_card=4505 then '北海市'
-                                                             when b.id_card=4506 then '防城港市'
-                                                             when b.id_card=4507 then '钦州市'
-                                                             when b.id_card=4508 then '贵港市'
-                                                             when b.id_card=4509 then '玉林市'
-                                                             when b.id_card=4510 then '百色市'
-                                                             when b.id_card=4511 then '贺州市'
-                                                             when b.id_card=4512 then '河池市'
-                                                             when b.id_card=4513 then '来宾市'
-                                                             when b.id_card=4514 then '崇左市'
-            end) as city,total_count,male_count,female_count
-            from (select  left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4) as id_card,count(1) as total_count,
-            sum(case when gender='男' then 1 else 0 end) as male_count,
-            sum(case when gender='女' then 1 else 0 end) as female_count
-            from srs_student d left join srs_class e on d.class_id=e.class_id
-            left join srs_grade f on f.grade_id=e.grade_id
-            where f.grade_status in (1,3)  GROUP BY left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4)) b) c where c.city is null
+        select sum(total_count) as number
+        from (select (case
+                          when b.id_card = 4501 then '南宁市'
+                          when b.id_card = 4502 then '柳州市'
+                          when b.id_card = 4503 then '桂林市'
+                          when b.id_card = 4504 then '梧州市'
+                          when b.id_card = 4505 then '北海市'
+                          when b.id_card = 4506 then '防城港市'
+                          when b.id_card = 4507 then '钦州市'
+                          when b.id_card = 4508 then '贵港市'
+                          when b.id_card = 4509 then '玉林市'
+                          when b.id_card = 4510 then '百色市'
+                          when b.id_card = 4511 then '贺州市'
+                          when b.id_card = 4512 then '河池市'
+                          when b.id_card = 4513 then '来宾市'
+                          when b.id_card = 4514 then '崇左市'
+            end) as city,
+                     total_count,
+                     male_count,
+                     female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+                    from srs_student d left join srs_class e
+                    on d.class_id=e.class_id
+                        left join srs_grade f on f.grade_id=e.grade_id
+                    where f.grade_status in (1, 3)
+                    GROUP BY left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4)) b) c
+        where c.city is null
     </select>
     <select id="getMajorsCount" resultType="java.util.Map">
-        select d.dept_name as deptName,
-               count(case when year(CURDATE())-f.grade_code=1 then '大一' end) as firstCount,
-               count(case when year(CURDATE())-f.grade_code=2 then '大二' end) as thirdCount,
-               count(case when year(CURDATE())-f.grade_code=3 then '大三' end) as secondCount from srs_student s
-               left JOIN srs_class c ON s.class_id = c.class_id
-              left JOIN srs_majors m ON c.major_id = m.major_id
-              left JOIN sys_dept d ON m.college_id = d.dept_id
-              left join cph_teacher as e on c.teacher_id = e.teacher_id
-              left join srs_grade as f on f.grade_id=c.grade_id
-        where f.grade_status in (1,3) group by d.dept_name
+        select d.dept_name                                                      as deptName,
+               count(case when year (CURDATE())-f.grade_code=1 then '大一' end) as firstCount,
+               count(case when year (CURDATE())-f.grade_code=2 then '大二' end) as thirdCount,
+               count(case when year (CURDATE())-f.grade_code=3 then '大三' end) as secondCount
+        from srs_student s
+                 left JOIN srs_class c ON s.class_id = c.class_id
+                 left JOIN srs_majors m ON c.major_id = m.major_id
+                 left JOIN sys_dept d ON m.college_id = d.dept_id
+                 left join cph_teacher as e on c.teacher_id = e.teacher_id
+                 left join srs_grade as f on f.grade_id = c.grade_id
+        where f.grade_status in (1, 3)
+        group by d.dept_name
         order by d.dept_name
     </select>
-    <select id="getFiveSchoolTotalCount"  resultType="java.util.Map">
-        select f.grade_code as gradeCode,count(1) as number from  srs_student s
-        left join srs_class c on s.class_id=c.class_id
-        left join srs_majors m on c.major_id=m.major_id
-        left join sys_dept d on m.college_id=d.dept_id
-        left join cph_teacher as e on c.teacher_id=e.teacher_id
-        left join srs_grade as f on f.grade_id=c.grade_id
-        where f.grade_code>=year(date_sub(curdate(),interval 5 year))
-        group by f.grade_code order by f.grade_code
+    <select id="getFiveSchoolTotalCount" resultType="java.util.Map">
+        select f.grade_code as gradeCode, count(1) as number
+        from srs_student s
+                 left join srs_class c on s.class_id = c.class_id
+                 left join srs_majors m on c.major_id = m.major_id
+                 left join sys_dept d on m.college_id = d.dept_id
+                 left join cph_teacher as e on c.teacher_id = e.teacher_id
+                 left join srs_grade as f on f.grade_id = c.grade_id
+        where f.grade_code >= year (date_sub(curdate(), interval 5 year))
+        group by f.grade_code
+        order by f.grade_code
     </select>
     <select id="statusList" resultType="com.srs.system.domain.vo.StuStatus">
-        select dict_label, dict_value from sys_dict_data where dict_type='srs_stu_status'
+        select dict_label, dict_value
+        from sys_dict_data
+        where dict_type = 'srs_stu_status'
     </select>
 </mapper>

srs-staff/src/main/java/com/srs/staff/service/impl/SrsStaffOneStopRegistrationRecordServiceImpl.java

@@ -102,7 +102,7 @@ public class SrsStaffOneStopRegistrationRecordServiceImpl extends ServiceImpl<Sr
      */
     @Override
     public int insertSrsStaffOneStopRegistrationRecord(SrsStaffOneStopRegistrationRecord srsStaffOneStopRegistrationRecord) {
-//        srsStaffOneStopRegistrationRecord.setJobNumber(SecurityUtils.getLoginUser().getUser().getUserName());   获取的是当前登陆人信息
+        srsStaffOneStopRegistrationRecord.setJobNumber(SecurityUtils.getUsername());   //获取的是当前登陆人信息
         String applicantJobNumber = srsStaffOneStopRegistrationRecord.getJobNumber(); // 获取申请人工号   知无涯
         if (applicantJobNumber == null) {
             throw new ServiceException("申请人工号不能为空", 500);

srs-stureg/src/main/java/com/srs/stureg/domain/GxsdxySjzx009Temp2024xsxx.java

@@ -0,0 +1,49 @@
+package com.srs.stureg.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("gxsdxy_sjzx_009_temp_2024xsxx")
+public class GxsdxySjzx009Temp2024xsxx {
+
+    @TableField("临时学号_报到后给新的")
+    public String 临时学号报到后给新的; // 临时学号_报到后给新的
+    @TableField("姓名")
+    public String 姓名; // 姓名
+    @TableField("性别")
+    public String 性别; // 性别
+    @TableField("出生日期字符串")
+    public String 出生日期字符串; // 出生日期字符串
+    @TableField("民族代码")
+    public String 民族代码; // 民族代码
+    @TableField("民族名称")
+    public String 民族名称; // 民族名称
+    @TableField("政治面貌代码")
+    public String 政治面貌代码; // 政治面貌代码
+    @TableField("政治面貌名称")
+    public String 政治面貌名称; // 政治面貌名称
+    @TableField("教务系统_所属院系")
+    public String 教务系统所属院系; // 教务系统_所属院系
+    @TableField("教务系统_年度专业代码")
+    public String 教务系统年度专业代码; // 教务系统_年度专业代码\
+    @TableField("教务系统_专业名称")
+    public String 教务系统专业名称; // 教务系统_专业名称
+    @TableField("教务系统_班级编号")
+    public String 教务系统班级编号; // 教务系统_班级编号
+    @TableField("班级名称")
+    public String 班级名称; // 班级名称
+    @TableField("班级简称")
+    public String 班级简称; // 班级简称
+    @TableField("是否报到核验")
+    public String 是否报到核验; // 是否报到核验
+    @TableField("报到核验时间")
+    public String 报到核验时间; // 报到核验时间
+    @TableField("学号")
+    public String 学号; // 学号
+}

srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java

@@ -197,10 +197,10 @@ public class SrsStuReg extends BaseEntity
     @TableField("disable_descript")
     private String disableDescript;
     @Excel(name = "是否吸烟")
-    @TableField("isSmoke")
+    @TableField("is_smoke")
     public String isSmoke;
     @Excel(name = "是否早睡")
-    @TableField("isEarly")
+    @TableField("is_early")
     public String isEarly;
     @Excel(name = "兴趣特长")
     @TableField("hobby")

srs-stureg/src/main/java/com/srs/stureg/mapper/SrsStuRegMapper.java

@@ -1,8 +1,11 @@
 package com.srs.stureg.mapper;
 
+import com.srs.common.annotation.DataSource;
+import com.srs.common.enums.DataSourceType;
 import com.srs.comprehensive.domain.Vo.CphSearch;
 import com.srs.comprehensive.domain.Vo.DataScreen;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
+import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx;
 import com.srs.stureg.domain.SrsStuReg;
 import com.srs.stureg.domain.VO.TeacherVo;
 import org.apache.ibatis.annotations.MapKey;
@@ -22,6 +25,9 @@ import java.util.Map;
 @Mapper
 public interface SrsStuRegMapper extends EasyBaseMapper<SrsStuReg> {
 
+    @DataSource(DataSourceType.SLAVE)
+    public List<GxsdxySjzx009Temp2024xsxx> listXsxxTemp(GxsdxySjzx009Temp2024xsxx param);
+
     public List<Map<String,Object>> countRoomBed();
 
     public List<Map<String,Object>> countStuXb();

srs-stureg/src/main/java/com/srs/stureg/service/ISrsStuRegService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.comprehensive.domain.Vo.CphSearch;
 import com.srs.comprehensive.domain.Vo.DataScreen;
+import com.srs.stureg.domain.GxsdxySjzx009Temp2024xsxx;
 import com.srs.stureg.domain.SrsStuReg;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -24,6 +25,10 @@ import java.util.concurrent.Future;
  */
 public interface ISrsStuRegService extends IService<SrsStuReg> {
 
+    public AjaxResult syncClassCode();
+
+    public List<GxsdxySjzx009Temp2024xsxx> listXsxxTemp(GxsdxySjzx009Temp2024xsxx param);
+
     public List<Map<String,Object>> countRoomBed();
 
     public List<Map<String,Object>> countStuXb();

srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java

@@ -3,19 +3,20 @@ package com.srs.stureg.service.impl;
 import java.lang.management.LockInfo;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.srs.common.annotation.DataSource;
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.common.core.domain.entity.SysDictData;
 import com.srs.common.core.domain.entity.SysUser;
+import com.srs.common.enums.DataSourceType;
 import com.srs.common.exception.ServiceException;
 import com.srs.common.utils.DateUtils;
 import com.srs.common.utils.SecurityUtils;
@@ -45,7 +46,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.srs.common.utils.SecurityUtils.getUsername;
@@ -97,6 +102,151 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
     @Autowired
     private ISrsClassService srsClassService;
 
+    @Autowired
+    public PlatformTransactionManager transactionManager;
+
+    @Override
+    public AjaxResult syncClassCode() {
+        // 初始化两个线程池，根据CPU核心数配置合理线程数
+        ThreadPoolExecutor pool1 = new ThreadPoolExecutor(
+                Runtime.getRuntime().availableProcessors() / 2,
+                Runtime.getRuntime().availableProcessors(),
+                60L, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(1000),
+                new ThreadFactory() {
+                    private final AtomicInteger counter = new AtomicInteger(1);
+                    @Override
+                    public Thread newThread(Runnable r) {
+                        return new Thread(r, "update-pool-1-" + counter.getAndIncrement());
+                    }
+                },
+                new ThreadPoolExecutor.CallerRunsPolicy() // 任务满时让提交线程执行，避免丢失
+        );
+
+        ThreadPoolExecutor pool2 = new ThreadPoolExecutor(
+                Runtime.getRuntime().availableProcessors() / 2,
+                Runtime.getRuntime().availableProcessors(),
+                60L, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(1000),
+                new ThreadFactory() {
+                    private final AtomicInteger counter = new AtomicInteger(1);
+                    @Override
+                    public Thread newThread(Runnable r) {
+                        return new Thread(r, "update-pool-2-" + counter.getAndIncrement());
+                    }
+                },
+                new ThreadPoolExecutor.CallerRunsPolicy()
+        );
+
+        try {
+            List<SrsStuReg> stuList = this.list();
+            List<GxsdxySjzx009Temp2024xsxx> tempList = srsStuRegMapper.listXsxxTemp(new GxsdxySjzx009Temp2024xsxx());
+
+            tempList.forEach(x -> {
+                x.临时学号报到后给新的 = x.临时学号报到后给新的.replace("LS", "");
+            });
+
+            List<SrsStuReg> needUpdateList = new ArrayList<>();
+            for (SrsStuReg srsStuReg : stuList) {
+                GxsdxySjzx009Temp2024xsxx temp = tempList.stream()
+                        .filter(x -> x.临时学号报到后给新的.equals(srsStuReg.getKSH()))
+                        .findFirst()
+                        .orElse(null);
+                if (temp != null) {
+                    SrsStuReg stu = new SrsStuReg();
+                    stu.setId(srsStuReg.getId());
+                    stu.setBJDM(temp.教务系统班级编号);
+                    stu.setBJ(temp.班级名称);
+                    needUpdateList.add(stu);
+                }
+            }
+
+            if (needUpdateList.isEmpty()) {
+                return AjaxResult.success("没有需要更新的数据");
+            }
+
+            // 将更新列表拆分为两部分，分配给两个线程池
+            int mid = needUpdateList.size() / 2;
+            List<SrsStuReg> part1 = needUpdateList.subList(0, mid);
+            List<SrsStuReg> part2 = needUpdateList.subList(mid, needUpdateList.size());
+
+            // 用于等待所有线程完成
+            CountDownLatch countDownLatch = new CountDownLatch(2);
+            // 用于捕获线程中的异常
+            AtomicReference<Exception> exceptionRef = new AtomicReference<>();
+
+            // 提交第一个任务到线程池1
+            pool1.submit(() -> {
+                try {
+                    if (!part1.isEmpty()) {
+                        boolean res = this.updateBatchById(part1);
+                        if (!res) {
+                            throw new Exception("线程池1批量更新失败");
+                        }
+                    }
+                } catch (Exception e) {
+                    exceptionRef.set(e);
+                } finally {
+                    countDownLatch.countDown();
+                }
+            });
+
+            // 提交第二个任务到线程池2
+            pool2.submit(() -> {
+                try {
+                    if (!part2.isEmpty()) {
+                        boolean res = this.updateBatchById(part2);
+                        if (!res) {
+                            throw new Exception("线程池2批量更新失败");
+                        }
+                    }
+                } catch (Exception e) {
+                    exceptionRef.set(e);
+                } finally {
+                    countDownLatch.countDown();
+                }
+            });
+
+            // 等待所有任务完成（最多等待30秒）
+            boolean await = countDownLatch.await(30, TimeUnit.SECONDS);
+            if (!await) {
+                throw new Exception("批量更新超时");
+            }
+
+            // 检查是否有异常
+            if (exceptionRef.get() != null) {
+                throw exceptionRef.get();
+            }
+
+            return AjaxResult.success("同步班级代码成功，共更新" + needUpdateList.size() + "条数据");
+        } catch (Exception ex) {
+            return AjaxResult.error(ex.getMessage());
+        } finally {
+            // 关闭线程池
+            pool1.shutdown();
+            pool2.shutdown();
+            try {
+                // 等待线程池关闭（最多等5秒）
+                if (!pool1.awaitTermination(5, TimeUnit.SECONDS)) {
+                    pool1.shutdownNow();
+                }
+                if (!pool2.awaitTermination(5, TimeUnit.SECONDS)) {
+                    pool2.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                pool1.shutdownNow();
+                pool2.shutdownNow();
+            }
+        }
+    }
+
+
+    @Override
+    @DataSource(DataSourceType.SLAVE)
+    public List<GxsdxySjzx009Temp2024xsxx> listXsxxTemp(GxsdxySjzx009Temp2024xsxx param){
+        return srsStuRegMapper.listXsxxTemp(param);
+    }
+
 
     public SrsStuRegServiceImpl(List<SysUser> userList) {
         this.userList = userList;
@@ -136,6 +286,7 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
                         srsStuReg.setUpdateBy(getUsername());
                         srsStuReg.setBJ(srsStuReg.getBJ());
                         srsStuReg.setBJDM(srsStuReg.getBJDM());
+                        srsStuReg.setRegStatus(entity.getRegStatus());
                         int updateResult= srsStuRegMapper.updateSrsStuReg(srsStuReg);//更新新生注册表
                         count+=updateResult;
                         SysUser sysUser1 = new SysUser();
@@ -963,9 +1114,9 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
         stuReg.setIsRetired(srsStuReg.getIsRetired());
         stuReg.setIsFiling(srsStuReg.getIsFiling());
         stuReg.setDisableDescript(srsStuReg.getDisableDescript());
-        stuReg.isSmoke = srsStuReg.getIsSmoke();
-        stuReg.isEarly = srsStuReg.getIsEarly();
-        stuReg.hobby = srsStuReg.getHobby();
+        stuReg.setIsSmoke(srsStuReg.getIsSmoke());
+        stuReg.setIsEarly(srsStuReg.getIsEarly());
+        stuReg.setHobby(srsStuReg.getHobby());
 
         SrsStuTodo srsStuTodo = new SrsStuTodo();
         if (StringUtils.isNotEmpty(srsStuReg.getLoanNo())) {

srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml

@@ -50,6 +50,10 @@
         <result property="isFiling"    column="is_filing"    />
         <result property="isDisability"    column="is_disability"    />
         <result property="disableDescript"    column="disable_descript"    />
+        <result property="disableDescript"    column="disable_descript"    />
+        <result property="isSmoke"    column="is_smoke"    />
+        <result property="isEarly"    column="is_early"    />
+        <result property="hobby"    column="hobby"    />
     </resultMap>
 
     <sql id="selectSrsStuRegVo">
@@ -741,7 +745,6 @@
         left join srs_class cl on a.bjdm=class_code
         left join cph_teacher t on cl.teacher_id=t.teacher_id
         <where>
-            a.reg_status in (1,3,4)
             <if test="BJDM != null">and a.BJDM = #{BJDM}</if>
             <if test="params.tNo != null">and t.employee_id = #{params.tNo}</if>
             <if test="MZ != null">and a.MZ like concat('%', #{MZ},'%')</if>
@@ -998,4 +1001,13 @@
             (#{item.XSXM}, #{item.KSH}, #{item.SFZH}, #{item.SJH},#{item.XB},#{item.ZZMM},#{item.MZ},#{item.XY},#{item.ZY},#{item.lastSchool},#{item.famNowAddr},#{item.sfzAddr},#{item.createTime},#{item.createBy},#{item.BJ},#{item.BJDM})
         </foreach>
     </insert>
+
+    <select id="listXsxxTemp" resultType="GxsdxySjzx009Temp2024xsxx" parameterType="GxsdxySjzx009Temp2024xsxx">
+        select a.* from gxsdxy_sjzx_009_temp_2024xsxx as a
+        <where>
+            <if test="临时学号报到后给新的 != null  and 临时学号报到后给新的 != ''">and a.临时学号_报到后给新的 like CONCAT('%',#{临时学号报到后给新的},'%')</if>
+            <if test="教务系统班级编号 != null  and 教务系统班级编号 != ''">and a.教务系统_班级编号 = #{教务系统班级编号}</if>
+        </where>
+                   order by a.临时学号_报到后给新的 asc
+    </select>
 </mapper>