华颐合并至8小时

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -392,6 +392,34 @@ public class CmsController {
 		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
 		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
 	}
 	}
 
 
+	@PostMapping(value = "/oaCirculate")
+	@ApiOperation(value = "搜索OA文件传阅记录", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> oaCirculate(@CurrentUser UserBean userBean, @RequestBody QyxxQueryDto qyxxQueryDto) {
+		String s = qyxxQueryDto.getStartTime();
+		String e = qyxxQueryDto.getEndTime();
+		Integer r = qyxxQueryDto.getReleasestate();
+
+		Page<CmsContent> page = new Page<CmsContent>(
+				qyxxQueryDto.getCurrentPage() == null ? 1 : qyxxQueryDto.getCurrentPage(),
+				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
+
+		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("organization_id", userBean.getOrgCode())
+				.eq("modularid", 7).eq(r != null && r > -1, "releasestate", r)
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+				.and(wq -> wq.like("publisher", userBean.getEmpNum()).or().like("author", userBean.getUserInfo().getName()).or().like("title",  userBean.getUserInfo().getName()))
+				.orderByDesc("addeddate");
+		IPage<CmsContent> cmsContentPage = CmsContent.builder().build().selectPage(page, queryWrapper);
+		List<CmsContent> cmsContents = cmsContentPage.getRecords();
+		cmsContentPage.getCurrent();
+		cmsContentPage.getPages();
+		cmsContentPage.getTotal();
+		cmsContentPage.getSize();
+		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
+	}
+
 	/**
 	/**
 	 * 根据id查讯息
 	 * 根据id查讯息
 	 * 
 	 * 

src/main/resources/application-test.yml

@@ -31,7 +31,7 @@ spring:
     # username: tang
     # username: tang
     # password: Tang123456!
     # password: Tang123456!
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
-    url: jdbc:mysql://120.78.162.177:3306/timer_huayi?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://120.78.162.177:3306/timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver