Browse Source

第二课堂

dzx 1 year ago
parent
commit
f63d48ab65

+ 1 - 1
src/main/java/com/xjrsoft/module/courseTable/dto/AddSecondCourseTimeDto.java

@@ -30,7 +30,7 @@ public class AddSecondCourseTimeDto implements Serializable {
     * 上课日期
     */
     @ApiModelProperty("上课日期")
-    private LocalDate classTime;
+    private String classTime;
     /**
     * 时段(1=上午 2=下午 3=晚上)
     */

+ 1 - 1
src/main/java/com/xjrsoft/module/courseTable/entity/SecondCourseTime.java

@@ -79,7 +79,7 @@ public class SecondCourseTime implements Serializable {
     * 上课日期
     */
     @ApiModelProperty("上课日期")
-    private Date classTime;
+    private String classTime;
     /**
     * 时段(1=上午 2=下午 3=晚上)
     */

+ 1 - 1
src/main/java/com/xjrsoft/module/courseTable/vo/SecondCourseTimeVo.java

@@ -29,7 +29,7 @@ public class SecondCourseTimeVo {
     * 上课日期
     */
     @ApiModelProperty("上课日期")
-    private Date classTime;
+    private String classTime;
     /**
     * 时段(1=上午 2=下午 3=晚上)
     */

+ 1 - 1
src/main/resources/mapper/organization/UserMapper.xml

@@ -28,7 +28,7 @@
         left join xjr_user t5 on t4.teacher_id = t5.id
         WHERE t1.delete_mark = 0
         <if test="dto.keyword != null and dto.keyword != ''">
-            AND (t1.name = #{dto.keyword} OR t1.credential_number = #{dto.keyword})
+            AND (t1.name like concat('%', #{dto.keyword}, '%') OR t1.credential_number like concat('%', #{dto.keyword}, '%'))
         </if>
         <if test="dto.userId != null">
             AND t1.id = #{dto.userId}