From 96362a744244338b32e1ae58f4d955dbde0bdc1e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 06 六月 2024 10:47:34 +0800
Subject: [PATCH] 班级通知
---
src/main/java/com/ycl/jxkg/controller/admin/ClassesNotifyController.java | 1 -
src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java | 7 +++++++
src/main/java/com/ycl/jxkg/domain/form/ClassesNotifyForm.java | 4 ----
src/main/resources/mapper/ClassesMapper.xml | 6 ++++++
src/main/java/com/ycl/jxkg/service/impl/ClassesNotifyServiceImpl.java | 3 +++
src/main/java/com/ycl/jxkg/domain/entity/ClassesNotify.java | 6 ++++++
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesNotifyController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesNotifyController.java
index 3a903ac..809e34d 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesNotifyController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesNotifyController.java
@@ -34,7 +34,6 @@
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('classesNotify:add')")
public Result add(@RequestBody @Validated(Add.class) ClassesNotifyForm form) {
return classesNotifyService.add(form);
}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ClassesNotify.java b/src/main/java/com/ycl/jxkg/domain/entity/ClassesNotify.java
index 6fe48ed..ab7cdc7 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ClassesNotify.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ClassesNotify.java
@@ -1,10 +1,13 @@
package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
+
+import java.util.Date;
/**
* 鐝骇閫氱煡
@@ -30,5 +33,8 @@
/** 閫氱煡鍐呭 */
private String notifyContent;
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ClassesNotifyForm.java b/src/main/java/com/ycl/jxkg/domain/form/ClassesNotifyForm.java
index b660d7b..990f2de 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ClassesNotifyForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ClassesNotifyForm.java
@@ -27,7 +27,6 @@
@ApiModelProperty("鐝骇")
private Integer classesId;
- @NotNull(message = "鍙戝嚭閫氱煡鑰呬笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍙戝嚭閫氱煡鑰�")
private Integer teacherId;
@@ -35,9 +34,6 @@
@ApiModelProperty("閫氱煡鍐呭")
private String notifyContent;
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private Date createTime;
public static ClassesNotify getEntityByForm(@NonNull ClassesNotifyForm form, ClassesNotify entity) {
if(entity == null) {
diff --git a/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java b/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
index 1aec3cf..c28defa 100644
--- a/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
+++ b/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
@@ -19,5 +19,12 @@
@Data
@ApiModel(value = "Classes鏌ヨ", description = "鐝骇鏌ヨ")
public class ClassesQuery extends AbsQuery {
+
+ /** 鐝骇鍚嶇О */
+ private String className;
+
+ /** 鐝骇鐘舵�� */
+ private String status;
+
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesNotifyServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesNotifyServiceImpl.java
index 7502ed6..180eb7b 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesNotifyServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesNotifyServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.ClassesNotify;
import com.ycl.jxkg.mapper.ClassesNotifyMapper;
import com.ycl.jxkg.service.ClassesNotifyService;
@@ -29,6 +30,7 @@
public class ClassesNotifyServiceImpl extends ServiceImpl<ClassesNotifyMapper, ClassesNotify> implements ClassesNotifyService {
private final ClassesNotifyMapper classesNotifyMapper;
+ private final WebContext webContext;
/**
* 娣诲姞
@@ -38,6 +40,7 @@
@Override
public Result add(ClassesNotifyForm form) {
ClassesNotify entity = ClassesNotifyForm.getEntityByForm(form, null);
+ entity.setTeacherId(webContext.getCurrentUser().getId());
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 95bd72e..2481ae5 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -64,6 +64,12 @@
LEFT JOIN t_user TU ON TU.id = TC.create_user AND TU.deleted = 0
WHERE
TC.deleted = 0
+ <if test="query.className != null and query.className != ''">
+ AND TC.class_name like concat('%', #{query.className}, '%')
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND TC.status = #{query.status}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0