From 534c9a841aad04fce5d08210a1ccf159c6df169b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:36:16 +0800
Subject: [PATCH] 1.通知公告接口修改 2.考试培训接口修改
---
src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml | 11 ++++++++++-
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 3 +++
src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java | 5 +++++
src/main/java/org/springblade/modules/desk/entity/Notice.java | 6 ++++++
src/main/java/org/springblade/modules/desk/vo/NoticeVO.java | 10 ++++++++++
src/main/java/org/springblade/modules/desk/controller/NoticeController.java | 11 +++++++++++
6 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
index e49dd9b..d513ec1 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -32,6 +32,8 @@
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
import org.springblade.modules.desk.wrapper.NoticeWrapper;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -51,6 +53,8 @@
public class NoticeController extends BladeController {
private final INoticeService noticeService;
+
+ private final IDeptService iDeptService;
/**
* 详情
@@ -89,6 +93,13 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入notice")
public R<IPage<NoticeVO>> page(@ApiIgnore NoticeVO notice, Query query) {
+ //通过deptId获取组织机构信息
+ Dept dept = iDeptService.getById(notice.getDeptId());
+// if (dept.getDeptCategory() == 1) {
+// notice.setCategory(1);
+// } else {
+// notice.setCategory(2);
+// }
IPage<NoticeVO> pages = noticeService.selectNoticePage(Condition.getPage(query), notice);
return R.data(pages);
}
diff --git a/src/main/java/org/springblade/modules/desk/entity/Notice.java b/src/main/java/org/springblade/modules/desk/entity/Notice.java
index 2cfc00f..8e86044 100644
--- a/src/main/java/org/springblade/modules/desk/entity/Notice.java
+++ b/src/main/java/org/springblade/modules/desk/entity/Notice.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.desk.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -60,5 +61,10 @@
@ApiModelProperty(value = "内容")
private String content;
+ /**
+ * 单位id
+ */
+ @TableField("dept_id")
+ private Long deptId;
}
diff --git a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
index 6694ee4..9b8b669 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -40,7 +40,7 @@
d.dict_value AS categoryName
FROM
blade_notice n
- LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key
+ LEFT JOIN ( SELECT * FROM blade_dict WHERE code = 'notice' ) d ON n.category = d.dict_key
WHERE
n.is_deleted = 0 and n.tenant_id = #{notice.tenantId}
<if test="notice.title!=null">
@@ -49,5 +49,14 @@
<if test="notice.category!=null">
and n.category = #{notice.category}
</if>
+ <if test="notice.startTime!=null and notice.startTime!=''">
+ and n.release_time >= #{notice.startTime}
+ </if>
+ <if test="notice.endTime!=null and notice.endTime!=''">
+ and n.release_time <= #{notice.endTime}
+ </if>
+ <if test="notice.category!=null">
+ and n.category = #{notice.category}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/desk/vo/NoticeVO.java b/src/main/java/org/springblade/modules/desk/vo/NoticeVO.java
index 3dd6235..4faee8c 100644
--- a/src/main/java/org/springblade/modules/desk/vo/NoticeVO.java
+++ b/src/main/java/org/springblade/modules/desk/vo/NoticeVO.java
@@ -20,4 +20,14 @@
@ApiModelProperty(value = "租户编号")
private String tenantId;
+ /**
+ * 通知开始时间
+ */
+ private String startTime;
+
+ /**
+ * 通知结束时间
+ */
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
index f58dbbe..607bd64 100644
--- a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
+++ b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
@@ -91,4 +91,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trainingTime;
+ /**
+ * 是否取消报名 1:否 2:是
+ */
+ private Integer cancel;
+
}
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index f03554e..0d23c0c 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -20,6 +20,9 @@
<if test="trainingRegistration.name!=null and trainingRegistration.name!=''">
and sr.name like concat('%', #{trainingRegistration.name},'%')
</if>
+ <if test="trainingRegistration.cancel!=null">
+ and sr.cancel = #{trainingRegistration.cancel}
+ </if>
</select>
<!--报名培训详情信息-->
--
Gitblit v1.9.3