Ver Fonte

课表数据同步逻辑调整

dzx há 1 ano atrás
pai
commit
5b1ff3b0ef

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -361,9 +361,9 @@ public class BaseNewStudentController {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
         for (BaseNewStudentPageVo el : reportList) {
             BaseNewStudentExportVo vo = BeanUtil.toBean(el, BaseNewStudentExportVo.class);
-            if(el.getIsAdjust() == 1){
+            if(el.getIsReport() == 1){
                 vo.setReportStatus("是");
-            }else if(el.getIsAdjust() == 0){
+            }else if(el.getIsReport() == 0){
                 vo.setReportStatus("否");
             }
             if(el.getReportTime() != null){

+ 1 - 11
src/main/java/com/xjrsoft/module/student/vo/BaseNewStudentExportVo.java

@@ -17,53 +17,43 @@ import java.time.LocalDate;
 public class BaseNewStudentExportVo {
 
     @ExcelProperty("班级名称")
-    @ApiModelProperty("班级名称")
     private String className;
 
     @ExcelProperty("班主任")
-    @ApiModelProperty("班主任")
     private String teacherName;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("学生姓名")
-    @ApiModelProperty("学生姓名")
     private String name;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("性别")
-    @ApiModelProperty("性别中文")
     private String genderCn;
     /**
     * 身份证号
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("身份证号")
-    @ApiModelProperty("身份证号")
     private String credentialNumber;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("手机号")
-    @ApiModelProperty("手机号")
     private String mobile;
 
     @ExcelProperty("家长联系电话")
-    @ApiModelProperty("家长联系电话")
     private String familyMobile;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("学生来源")
-    @ApiModelProperty("学生来源")
     private String sourceCn;
 
     @ExcelProperty("就读方式")
-    @ApiModelProperty("就读方式")
     private String stduyStatusCn;
 
     @ExcelProperty("报到状态")
     private String reportStatus;
 
-    @ExcelProperty("报到时间")
-    @ApiModelProperty("报到时间")
+    @ExcelProperty("到校时间")
     private String reportTime;
 
 }