Merge branch 'pre'

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

@@ -53,8 +53,8 @@ public class JianyuekbScheduleTask {
 
         //查询出传入排课系统的年级和班级
         sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''" +
-                " and table_name = 'base_grade'" +
-                " and jianyue_id in (" + eduYearSerialNo1.toString().replace("[","").replace("]","") + ")";
+            " and table_name = 'base_grade'" +
+            " and jianyue_id in (" + eduYearSerialNo1.toString().replace("[","").replace("]","") + ")";
         List<Map<String, Object>> jianyueData = SqlRunnerAdapter.db().selectList(sql);
         Map<String, List<Long>> gradeClassMaps = new HashMap<>();//存入对应年级的所有班级id
         for (Map<String, Object> el : jianyueData) {
@@ -83,7 +83,7 @@ public class JianyuekbScheduleTask {
             String startDateStr = receiveMsg.get("start_date").toString();
             String endDateStr = receiveMsg.get("end_date").toString();
             //删除课表信息
-            String delSql = "delete from course_table where schedule_date between '" + startDateStr + "'" +
+            String delSql = "delete from course_table where schedule_date between DATE_FORMAT(NOW(), '%Y-%m-%d')" +
                     " and '" + endDateStr + "'" +
                     " and class_id in (" + gradeClassMaps.get(eduYearSerialNo).toString().replace("[","").replace("]","")+ ")";
             SqlRunnerAdapter.db().delete(delSql);

src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -358,12 +358,12 @@ public class BaseNewStudentController {
     public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
         List<BaseNewStudentPageVo> reportList = baseNewStudentService.getReportList(dto);
         List<BaseNewStudentExportVo> exportVos = new ArrayList<>();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        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){

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;
 
 }

src/main/java/com/xjrsoft/module/student/vo/BaseNewStudentPageVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -169,7 +169,7 @@ public class BaseNewStudentPageVo {
     private Long userId;
 
     @ApiModelProperty("报到时间")
-    private LocalDate reportTime;
+    private LocalDateTime reportTime;
 
     @ApiModelProperty("是否已报到（1:是 0:否）")
     private Integer isReport;

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -227,7 +227,7 @@
         <if test="dto.isReport != null">
             AND (select count(*) from student_report_record where user_id = t1.id and base_semester_id = #{dto.baseSemesterId} and delete_mark = 0) = #{dto.isReport}
         </if>
-        <if test="dto.stduyStatus != null">
+        <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
             AND t10.stduy_status = #{dto.stduyStatus}
         </if>
         <if test="dto.enrollmentPlanId != null">