修改新生同步

src/main/java/com/xjrsoft/module/job/BaseNewStudentTask.java

@@ -142,6 +142,9 @@ public class BaseNewStudentTask {
         List<BaseNewStudent> insertList = new ArrayList<>();
         for (PbCseFeeobjupdate feeobjupdate : dataList) {
             BaseNewStudent existsNewStudent = existsNewStudentMap.get(feeobjupdate.getPersonalid());
+            if(feeobjupdate.getUserdef6()==null){
+                continue;
+            }
             Long planId = planMap.get(feeobjupdate.getEnteryear() + feeobjupdate.getUserdef6());
             if (existsNewStudent != null) {
                 if (existsNewStudent.getStatus() != null && existsNewStudent.getStatus() == 1) {
@@ -181,9 +184,11 @@ public class BaseNewStudentTask {
                 existsNewStudent.setSecondAmbitionId(majorSetNameMap.get(feeobjupdate.getZytjspec()));
                 existsNewStudent.setGender(GenderDictionaryEnum.getCode(feeobjupdate.getSex()));
                 existsNewStudent.setModifyDate(new Date());
+
                 if (!planId.equals(existsNewStudent.getEnrollmentPlanId())) {
                     existsNewStudent.setStatus(0);
                 }
+
                 existsNewStudent.setEnrollmentPlanId(planId);
                 updateList.add(existsNewStudent);
                 continue;

src/main/resources/mapper/classtime/ClassCourseTimeStatisticsSetGroupMapper.xml

@@ -0,0 +1,19 @@
+<?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">
+<mapper namespace="com.xjrsoft.module.classtime.mapper.ClassCourseTimeStatisticsSetMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.classtime.dto.ClassCourseTimeStatisticsSetPageDto" resultType="com.xjrsoft.module.classtime.vo.ClassCourseTimeStatisticsSetPageVo">
+        SELECT t1.id,t1.class_id,t1.course_id,t1.json_content,t1.is_default,t2.name class_name,t3.name course_name FROM class_course_time_statistics_set t1
+        INNER JOIN base_class t2 ON t1.class_id = t2.id
+        INNER JOIN base_course_subject t3 on t1.course_id=t3.id
+        WHERE t1.delete_mark = 0
+        <if test="dto.className != null and dto.className != ''">
+            and t2.name like concat('%', #{dto.className},'%')
+        </if>
+        <if test="dto.courseName != null and dto.courseName != ''">
+            and t3.name like concat('%', #{dto.courseName},'%')
+        </if>
+        order by t1.create_date desc
+    </select>
+</mapper>