Explorar el Código

1、新生同步调整,将毕业班级同步过来
2、移动端学生信息增加身份证号返回

dzx hace 8 meses
padre
commit
bd9c710172

+ 2 - 0
src/main/java/com/xjrsoft/module/job/BaseNewStudentTask.java

@@ -141,6 +141,7 @@ public class BaseNewStudentTask {
                     }
                 }
                 existsNewStudent.setGraduateSchool(feeobjupdate.getGraduations());
+                existsNewStudent.setGraduateClass(feeobjupdate.getGradclass());
                 existsNewStudent.setStduyStatus(StudyStatusEnum.getCode(feeobjupdate.getQuartername()));
                 existsNewStudent.setSource(StudentTypeEnum.getCode(feeobjupdate.getResourcename()));
                 existsNewStudent.setMobile(feeobjupdate.getTelephone());
@@ -180,6 +181,7 @@ public class BaseNewStudentTask {
                             }
                         }
                         setGraduateSchool(feeobjupdate.getGraduations());
+                        setGraduateClass(feeobjupdate.getGradclass());
                         setStduyStatus(StudyStatusEnum.getCode(feeobjupdate.getQuartername()));
                         setSource(StudentTypeEnum.getCode(feeobjupdate.getResourcename()));
                         setMobile(feeobjupdate.getTelephone());

+ 2 - 1
src/main/java/com/xjrsoft/module/student/entity/PbCseFeeobjupdate.java

@@ -136,5 +136,6 @@ public class PbCseFeeobjupdate implements Serializable {
     @ApiModelProperty("更新时间")
     private String updatetime;
 
-
+    @ApiModelProperty("毕业班级")
+    private String gradclass;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -126,4 +126,7 @@ public class BaseStudentInfoDetailVo {
 
     @ApiModelProperty("学生档案编号")
     private String archivesNumber;
+
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoPageVo.java

@@ -120,4 +120,7 @@ public class BaseStudentInfoPageVo {
 
     @ApiModelProperty("学生类别")
     private String studentForm;
+
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
 }

+ 3 - 1
src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -31,7 +31,8 @@
             t8.name AS stduy_status,
             t13.name AS roll_modality,
             t11.name AS student_form,
-            CONCAT(t16.name, ' ', t15.room_name, ' ', t14.bed_number) AS bed_info
+            t2.credential_number,
+        CONCAT(t16.name, ' ', t15.room_name, ' ', t14.bed_number) AS bed_info
         FROM base_student t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
@@ -76,6 +77,7 @@
         SELECT t2.id,
                t2.name AS student_name,
                t2.mobile AS phone,
+               t2.credential_number,
                t2.gender,
                t11.name AS genderCn,
                t1.student_id,