liu 1 ano atrás
pai
commit
860badf203

Diferenças do arquivo suprimidas por serem muito extensas
+ 921 - 23
src/main/java/com/template/controller/GraduateController.java


+ 2 - 2
src/main/java/com/template/controller/SmartUserController.java

@@ -4572,7 +4572,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 if (useXw == 1) {
                     CommonResult updateStudent = SeewoUpdateStudent(seewoClient, su);
                     if (!updateStudent.isSuccess()) {
-                        if (updateStudent.getMessage().equals("学生不存在")) {
+                        if (updateStudent.getMessage().contains("学生不存在")) {
                             CommonResult<String> insertStudent = SeewoInsertStudent(seewoClient, su.getName(), su.getCardNo(), su.getSexId(), su.getPhone(), classData.getClassUid());
                             if (!insertStudent.isSuccess()) {
                                 return CommonResult.fail("希沃平台:" + insertStudent.getMessage());
@@ -4616,7 +4616,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                     String endTime = queryGraduationYear(gradeData.getGradeNo());
                     CommonResult updateBsStudent = bsUpdateStudent(su, classData.getBsClassNo(), startTime, endTime);
                     if (!updateBsStudent.isSuccess()) {
-                        if (updateBsStudent.getMessage().equals("人员不存在或已删除")) {
+                        if (updateBsStudent.getMessage().contains("人员不存在或已删除")) {
                             //region 百胜新增学生信息
                             CommonResult<String> insertBsStudent = bsInsertStudent(usur.getName(), usur.getCardNo(), usur.getSexId(), usur.getHeadImage(), usur.getTimeGroupId(), classData.getBsClassNo(), startTime, endTime, usur.getIdCard());
                             if (!insertBsStudent.isSuccess()) {

+ 1 - 0
src/main/resources/mapper/template/SmartClassMapper.xml

@@ -9,6 +9,7 @@
         FROM `smart_class` sc
                  LEFT JOIN smart_grade sg ON sc.grade_id = sg.id
         where sc.deleted=0
+        AND sc.`name` LIKE '%年级%'
         <if test="className != null and className != ''">
             AND sc.`name` like '%' #{className} '%'
         </if>