8小时后台--

文件传阅列表

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

@@ -108,7 +108,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 分类，获取标题和发布时间
 	 * 分类，获取标题和发布时间
-	 * 
+	 *
 	 */
 	 */
 //	@GetMapping(value = "/flhqqyxx")
 //	@GetMapping(value = "/flhqqyxx")
 //	@ApiOperation(value = "获取首页分类讯息标题、发布时间", httpMethod = "GET", notes = "接口发布说明")
 //	@ApiOperation(value = "获取首页分类讯息标题、发布时间", httpMethod = "GET", notes = "接口发布说明")
@@ -141,7 +141,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 分类内容获取
 	 * 分类内容获取
-	 * 
+	 *
 	 */
 	 */
 	@GetMapping(value = "/getType")
 	@GetMapping(value = "/getType")
 	@ApiOperation(value = "分类内容获取", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "分类内容获取", httpMethod = "GET", notes = "接口发布说明")
@@ -174,7 +174,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 获取分类
 	 * 获取分类
-	 * 
+	 *
 	 */
 	 */
 	@GetMapping(value = "/xxfl")
 	@GetMapping(value = "/xxfl")
 	@ApiOperation(value = "获取分类", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "获取分类", httpMethod = "GET", notes = "接口发布说明")
@@ -364,7 +364,7 @@ public class CmsController {
 		cmsContentPage.getSize();
 		cmsContentPage.getSize();
 		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
 		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
 	}
 	}
-	
+
 	/**
 	/**
 	 * 企业OA讯息查询
 	 * 企业OA讯息查询
 	 */
 	 */
@@ -398,9 +398,37 @@ 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查讯息
-	 * 
+	 *
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
@@ -456,7 +484,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 讯息发布
 	 * 讯息发布
-	 * 
+	 *
 	 * @param id
 	 * @param id
 	 */
 	 */
 	@GetMapping(value = "/qyxxsdfb/{id}")
 	@GetMapping(value = "/qyxxsdfb/{id}")
@@ -475,7 +503,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 讯息收回
 	 * 讯息收回
-	 * 
+	 *
 	 * @param id
 	 * @param id
 	 */
 	 */
 	@GetMapping(value = "/qyxxtb/{id}")
 	@GetMapping(value = "/qyxxtb/{id}")
@@ -494,7 +522,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 添加已读
 	 * 添加已读
-	 * 
+	 *
 	 * @param userBean
 	 * @param userBean
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
@@ -520,7 +548,7 @@ public class CmsController {
 
 
 	/**
 	/**
 	 * 查询已读人
 	 * 查询已读人
-	 * 
+	 *
 	 * @param userBean
 	 * @param userBean
 	 * @param mid
 	 * @param mid
 	 * @return
 	 * @return