Merge remote-tracking branch 'origin/master'

ims-service/ims-eval/src/main/java/com/ims/eval/controller/NoticeManagementController.java

@@ -1,5 +1,6 @@
 package com.ims.eval.controller;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -246,12 +247,17 @@ public class NoticeManagementController {
 	 */
 	@GetMapping(value = "/circularDisplay")
 	public R circularDisplay(@RequestParam(value = "deptId") String deptId,
-							 @RequestParam(value = "noticeTitle") String noticeTitle) {
+							 @RequestParam(value = "noticeTitle") String noticeTitle,
+							 @RequestParam(value = "beginDataTime", required = false) String beginDataTime,
+							 @RequestParam(value = "endDataTime", required = false) String endDataTime) {
 		QueryWrapper<EvaluationNotice> qw = new QueryWrapper<>();
 		qw.lambda().eq(EvaluationNotice::getReleaseState, "已发布");
 		if (StringUtils.isNotEmpty(noticeTitle)) {
 			qw.lambda().eq(EvaluationNotice::getNoticeTitle, noticeTitle);
 		}
+		if (StringUtils.isNotEmpty(beginDataTime) && StringUtils.isNotEmpty(endDataTime)) {
+			qw.lambda().between(EvaluationNotice::getReleaseDate, DateUtil.parse(beginDataTime), DateUtil.parse(endDataTime));
+		}
 		List<EvaluationNotice> evaluationNoticeList = evaluationNoticeService.list(qw);
 		List<EvaluationNotice> list = new ArrayList<>();
 		for (EvaluationNotice evaluationNotice : evaluationNoticeList) {