Browse Source

考生管理新增电话号码

wangliang 2 years ago
parent
commit
5a2c311b4b

+ 5 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamStudentController.java

@@ -271,7 +271,7 @@ public class TEExamStudentController {
             if (Objects.isNull(teExamStudent)) {
                 if (Objects.isNull(teStudent)) {//如果学生数据为空则插入学生数据
                     //先插入学生档案数据
-                    teStudent = new TEStudent(tbOrg.getId(), s.getIdentity(), s.getName(), tbUser.getId());
+                    teStudent = new TEStudent(tbOrg.getId(), s.getIdentity(), s.getName(), tbUser.getId(), s.getMobileNumber());
                     teStudent.setPassword(SystemConstant.DEFAULT_PASSWORD);
                     teStudentService.save(teStudent);
                     s.setStudentId(teStudent.getId());
@@ -279,10 +279,14 @@ public class TEExamStudentController {
                 } else {//否则插入考生数据
                     s.setStudentId(teStudent.getId());
                     s.setCreateId(tbUser.getId());
+                    if (Objects.nonNull(s.getMobileNumber()) && !Objects.equals(s.getMobileNumber().trim(), "")) {
+                        teStudent.setMobileNumber(s.getMobileNumber());
+                    }
                 }
             } else {
                 UpdateWrapper<TEStudent> teStudentUpdateWrapper = new UpdateWrapper<>();
                 teStudentUpdateWrapper.lambda().set(TEStudent::getName, s.getName())
+                        .set(TEStudent::getMobileNumber, s.getMobileNumber())
                         .eq(TEStudent::getIdentity, s.getIdentity())
                         .eq(TEStudent::getOrgId, tbOrg.getId());
                 teStudentService.update(teStudentUpdateWrapper);

+ 12 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java

@@ -29,6 +29,10 @@ public class TEExamStudentDto implements Serializable {
     @ApiModelProperty(name = "证件号")
     private String identity;//证件号
 
+    @ExcelNote(value = "联系电话")
+    @ApiModelProperty(name = "联系电话")
+    private String mobileNumber;
+
     @ExcelNote(value = "科目名称")
     @ApiModelProperty(name = "科目名称")
     private String courseName;//科目名称
@@ -87,6 +91,14 @@ public class TEExamStudentDto implements Serializable {
     @ExcelNotExport
     private String basePhotoUrl;
 
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
     public void setEnableText(String enableText) {
         this.enableText = enableText;
     }

+ 12 - 0
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudent.java

@@ -92,6 +92,18 @@ public class TEExamStudent extends BaseEntity {
     @TableField(value = "course_name")
     private String courseName;
 
+    @ApiModelProperty(value = "联系电话")
+    @TableField(exist = false)
+    private String mobileNumber;
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
     public String getCourseName() {
         return courseName;
     }

+ 9 - 0
themis-business/src/main/java/com/qmth/themis/business/entity/TEStudent.java

@@ -71,6 +71,15 @@ public class TEStudent extends BaseEntity {
         setCreateId(createId);
     }
 
+    public TEStudent(Long orgId, String identity, String name, Long createId, String mobileNumber) {
+        setId(UidUtil.nextId());
+        this.orgId = orgId;
+        this.identity = identity;
+        this.name = name;
+        this.mobileNumber = mobileNumber;
+        setCreateId(createId);
+    }
+
     public Integer getEnable() {
         return enable;
     }

+ 2 - 1
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -22,7 +22,8 @@
         tees.class_no as classNo,
         teea.id as examActivityId,
         teea.code as activityCode,
-        stu.base_photo_path basePhotoUrl
+        stu.base_photo_path basePhotoUrl,
+        stu.mobile_number as mobileNumber
         from
         t_e_exam_student tees
         left join t_e_student stu on tees.student_id=stu.id