综合导入逻辑修改

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

@@ -3,8 +3,10 @@ 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接口
@@ -13,8 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023-06-28
  */
 @Mapper
-public interface SrsCeScoreMapper 
+public interface SrsCeScoreMapper {
-{
     /**
      * 查询综合评价
      *
@@ -30,6 +31,7 @@ public interface SrsCeScoreMapper
      * @return 综合评价集合
      */
     public List<SrsCeScore> selectSrsCeScoreList(SrsCeScore srsCeScore);
+
     public List<SrsCeScore> selectSrsCeScoreListS(SrsCeScore srsCeScore);
 
     /**
@@ -48,6 +50,8 @@ public interface SrsCeScoreMapper
      */
     public int updateSrsCeScore(SrsCeScore srsCeScore);
 
+
+
     /**
      * 删除综合评价
      *
@@ -66,6 +70,7 @@ public interface SrsCeScoreMapper
 
     /**
      * 综合评价连表查询
+     *
      * @return 结果
      */
     List<SrsCeScoreStudentStuYear> SrsCeScoreStudentStuYear(SrsCeScore srsCeScore);

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

@@ -147,76 +147,99 @@ public class SrsCeScoreServiceImpl implements ISrsCeScoreService
                     student.setStuNo(student.getStuNo().trim());
                     return student;
                 })
-                .collect(Collectors.toList());//清空前后空格
+                .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);//班级
+            List<SrsClass> srsClasses = srsClassMapper.selectSrsClassListTeacherId(srsClass);
-            //查询辅导员所带的班级学生
+
-            for (SrsClass scs : srsClasses) {
+            // 查询辅导员所带的班级学生 - 优化为批量查询
-                SrsStudent srsStudent = new SrsStudent();
+            if (!srsClasses.isEmpty()) {
-                srsStudent.setClassId(scs.getClassId());
+                List<Long> classIds = srsClasses.stream()
-//                srsStudent.setStatus("01");
+                        .map(SrsClass::getClassId)
-                //根据班级id查询学生
+                        .collect(Collectors.toList());
-                List<SrsStudent> srsStudentList1 = srsStudentMapper.selectSrsStudentList(srsStudent);
+                srsStudentList = srsStudentMapper.selectSrsStudentByClassIds(classIds);
-                srsStudentList.addAll(srsStudentList1);
             }
+
+            // 验证学生是否属于当前辅导员
             for (SrsCeScoreStudent scss : srsCeScoreStudents) {
                 if (scss.getCeScore().compareTo(new BigDecimal(100)) > 0) {
                     scss.setCeScore(new BigDecimal(100));
                 }
-                int i = 0;
+
-                for (SrsStudent ssd : srsStudentList) {
+                boolean isValidStudent = srsStudentList.stream()
-                    if (Objects.equals(scss.getStuNo(), ssd.getStuNo())) {
+                        .anyMatch(student -> Objects.equals(scss.getStuNo(), student.getStuNo()));
-                        i = 1;
+
-                        break;
+                if (!isValidStudent) {
-                    }
-                }
-                if (i == 0) {
                     error.append(scss.getStuNo()).append(",");
                 }
             }
+
             if (!error.toString().equals("")) {
                 throw new RuntimeException("表中的学号：" + error + "不是所带的学生，请删除后再尝试导入！");
             }
         }
-        //TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//标记为回滚状态
+
-        for (SrsCeScoreStudent i:srsCeScoreStudents){
+        // 分批处理数据，减少事务持有时间
+        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);
+        }
+
+        // 处理完成后调用测试方法
+//        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();//综合评价
+            SrsCeScore srsCeScore1 = new SrsCeScore();
-            SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(i.getStuNo());//查询学生信息
+            SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(i.getStuNo());
-            srsCeScore1.setStuId(srsStudent.getStuId());//学生id
+            srsCeScore1.setStuId(srsStudent.getStuId());
-            srsCeScore1.setStuYearId(i.getStuYearId());//学年id
+            srsCeScore1.setStuYearId(i.getStuYearId());
-            List<SrsCeScore> srsCeScores = srsCeScoreMapper.selectSrsCeScoreListS(srsCeScore1);//查询综合评价表重复
+
+            List<SrsCeScore> srsCeScores = srsCeScoreMapper.selectSrsCeScoreListS(srsCeScore1);
             srsCeScore1.setCeScore(i.getCeScore());
             srsCeScore1.setStuNo(i.getStuNo());
-            if (srsCeScores.size()==0){//判断综合评价表有没有重复的值
+
+            if (srsCeScores.isEmpty()) {
                 srsCeScore1.setCreateBy(getUsername());
                 srsCeScore1.setCreateTime(DateUtils.getNowDate());
-                srsCeScoreMapper.insertSrsCeScore(srsCeScore1);//没有则添加
+                srsCeScoreMapper.insertSrsCeScore(srsCeScore1);
-                //ifSrsAdd(srsAddRecord,srsAddRecords);
+            } else {
-                number++;
-                continue;
-            }
                 srsCeScore1.setUpdateBy(getUsername());
                 srsCeScore1.setUpdateTime(DateUtils.getNowDate());
                 srsCeScore1.setId(srsCeScores.get(0).getId());
-            srsCeScoreMapper.updateSrsCeScore(srsCeScore1);//有则修改
+                srsCeScoreMapper.updateSrsCeScore(srsCeScore1);
-            //ifSrsAdd(srsAddRecord,srsAddRecords);
-            number++;
             }
-        TransactionAspectSupport.currentTransactionStatus().flush();//手动提交事务
+            count++;
-        //cphTotalScoreMapper.testFor(id);
-        cphTestForService.testMethod(Math.toIntExact(srsCeScoreStudents.get(0).getStuYearId()));
-        return number;
         }
+
+        return count;
+    }
+
     private void ifSrsAdd(SrsAddRecord srsAddRecord, List<SrsAddRecord> srsAddRecords){
         if (srsAddRecords.size()==0){
             //添加

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

@@ -47,7 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
@@ -66,7 +73,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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">
@@ -124,8 +139,13 @@ 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">

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

@@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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" />
+        <association property="cphStuExtraInfo" column="stu_no" javaType="cphStuExtraInfo"
+                     resultMap="CphStuExtraInfoResult"/>
     </resultMap>
     <resultMap id="CphStuExtraInfoResult" type="CphStuExtraInfo">
         <result property="stuNo" column="stu_no"/>
@@ -77,15 +78,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <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,
+        select s.stu_id,
-               s.status, s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag,s.xhk,s.bank_addr
+               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,
+        select s.stu_id,
-               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,
+               s.stu_no,
-               d.*,m.*,c.*,g.*
+               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
@@ -110,7 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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">
@@ -135,17 +178,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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
@@ -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">
@@ -341,7 +392,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    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
+        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
@@ -353,7 +405,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    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>
@@ -380,6 +433,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by b.grade_id
     </select>
 
+    <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
@@ -392,18 +454,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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 sum(b.occupancy)                                                            as all_in,
-               (
+               a.park_name,
-                   select count(t1.stu_no) from view_stu_info as t1 where t1.`status` = '01'
+               a.campus_name,
-               ) as stu_count
+               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
+        SELECT c.dept_id    AS                            deptId,
-            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
@@ -416,54 +478,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY c.dept_id, h.grade_name, c.dept_name
     </select>
     <select id="selectStuQuitSchoolCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
+        SELECT department_Name deptName,
-            department_Name deptName,
                COUNT(*) AS     number
-        FROM
+        FROM rt_stu_quit_school
-            rt_stu_quit_school
+        WHERE apply_status = 1
-        WHERE
+        GROUP BY department_Name
-            apply_status = 1
-        GROUP BY
-            department_Name
     </select>
 
     <select id="selectStuPunishCount" resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
+        SELECT department_Name AS deptName,
-            department_Name AS deptName,
                COUNT(*)        AS number
-        FROM
+        FROM rt_stu_disciplinary_application
-            rt_stu_disciplinary_application
+        WHERE penalty_status = 0
-        WHERE
+        GROUP BY department_Name
-            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`
+        SELECT xy AS deptName, COUNT(id) AS number
-        where  stu_year_id in (SELECT id FROM srs_stu_year WHERE `status`=1)  and step >= 5 and xsqmyj !=4  group by  xy
+        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`
+        SELECT xy AS deptName, COUNT(id) AS number
-        where  stu_year_id in  (SELECT id FROM srs_stu_year WHERE `status`=1)  and step =4  group by  xy
+        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
+        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 ('自动化工程学院','水利工程学院','电力工程学院','水利工程学院','土木建筑工程学院','机电工程学院','交通工程学院','合作分校')
+        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
+        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 ('信息工程学院','经济管理学院')
+        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
+        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
@@ -473,20 +541,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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'
+        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
+        from (select count(1) as num, a.major_code
-            (
-                select count(1) as num,a.major_code
               from view_stu_info as a
-                where a.dept_name = #{deptName} and a.`status` = '01'
+              where a.dept_name = #{deptName}
-                GROUP BY a.major_code
+                and a.`status` = '01'
-            ) as t1
+              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
@@ -496,7 +564,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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)
+        where a.`status` = '01'
+          and a.dept_name is not null
+          and grade_status in (1, 3)
         group by a.dept_name
     </select>
 
@@ -504,7 +574,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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,8 +588,11 @@ 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 id="getRtStuQuitSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuQuitSchoolVo"
-        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
+            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>
@@ -526,8 +601,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by grade_name,class_name
     </select>
-    <select id="getRtStuDisciplinaryApplication" resultType="com.srs.comprehensive.domain.Vo.RtStuDisciplinaryApplicationVo" parameterType="stuDataSelcetDto">
+    <select id="getRtStuDisciplinaryApplication"
-        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
+            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>
@@ -536,8 +615,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by grade_name,class_name
     </select>
-    <select id="getRtStuDropOutSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuDropOutSchoolVo" parameterType="stuDataSelcetDto">
+    <select id="getRtStuDropOutSchool" resultType="com.srs.comprehensive.domain.Vo.RtStuDropOutSchoolVo"
-        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
+            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>
@@ -546,7 +628,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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>
@@ -554,7 +637,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="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>
@@ -564,51 +648,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectStuDropOutSchoolCount"
             resultType="com.srs.comprehensive.domain.Vo.DeptStuQuitPunisDataVo">
-        SELECT
+        SELECT department_Name AS deptName,
-            department_Name AS deptName,
                COUNT(*)        AS number
-        FROM
+        FROM rt_stu_drop_out_school
-            rt_stu_drop_out_school
+        WHERE apply_status = 1
-        WHERE
+        GROUP BY department_Name
-            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
+        select gender, count(1) as quantity
-        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
+        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
+                   )    as xsqmyj,
-        from srs_knrd_apply  where  stu_year_id in (select id from srs_stu_year where status=1)  and step >= 5 and xsqmyj !=4
+               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
+        SELECT CASE
-            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
+               COUNT(1)                       AS quantity,
-        FROM srs_student where birthday is not null
+               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 '南宁市'
+        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 '梧州市'
@@ -622,34 +725,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           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
+            end) as city,
-                             from (select  left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4) as id_card,count(1) as total_count,
+                     total_count,
-                                 sum(case when gender='男' then 1 else 0 end) as male_count,
+                     male_count,
-                                 sum(case when gender='女' then 1 else 0 end) as female_count
+                     female_count
-                             from srs_student d left join srs_class e on d.class_id=e.class_id
+              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;
+                    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
+        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
+        where c.grade_status in (1, 3)
-        group by c.grade_code order by grade_code desc
+          and gender is not null
+        group by c.grade_code
+        order by grade_code desc
     </select>
     <select id="getSchoolTotalCount" resultType="java.util.Map">
-        SELECT
+        SELECT COUNT(1)                                                                               AS TotalCount,
-            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
+        FROM srs_student d
-            left join srs_grade f on f.grade_id=e.grade_id where f.grade_status in (1,3) and gender is not null
+                 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 '南宁市'
+        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 '梧州市'
@@ -663,38 +777,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           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
+            end) as city,
-            from (select  left(AES_DECRYPT(UNHEX(id_card),'zhxg'),4) as id_card,count(1) as total_count,
+                     total_count,
-            sum(case when gender='男' then 1 else 0 end) as male_count,
+                     male_count,
-            sum(case when gender='女' then 1 else 0 end) as female_count
+                     female_count
-            from srs_student d left join srs_class e on d.class_id=e.class_id
+              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
+                    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
+               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
+        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
+        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
+        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);