Browse Source

解决新生维护信息查询的bug

dzx 8 months ago
parent
commit
af67fef848

+ 3 - 3
src/main/java/com/xjrsoft/module/student/dto/BaseNewStudentPageDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 
 /**
@@ -38,10 +38,10 @@ public class BaseNewStudentPageDto extends PageInput {
 
 
     @ApiModelProperty("添加时间-开始")
-    private Date startDate;
+    private LocalDateTime startDate;
 
     @ApiModelProperty("添加时间-结束")
-    private Date endDate;
+    private LocalDateTime endDate;
 
     @ApiModelProperty("毕业学校")
     private String graduateSchool;

+ 3 - 0
src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -17,6 +17,9 @@
         <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
             and t1.credential_number like concat('%', #{dto.credentialNumber}, '%')
         </if>
+        <if test="dto.graduateSchool != null and dto.graduateSchool != ''">
+            and t1.graduate_school like concat('%', #{dto.graduateSchool}, '%')
+        </if>
         <if test="dto.isImportScore != null">
             <if test="dto.isImportScore == 1">
                 and t1.score is not null