From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
index 6059107..095b8d9 100644
--- a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
+++ b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
@@ -37,23 +37,37 @@
IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectivePage(page, directive));
//去除接收人ids,查询出接收人名字
List<DirectiveVo> records = directiveVoIPage.getRecords();
- for (DirectiveVo record : records) {
- String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
- StringBuilder builder = new StringBuilder();
- for (String receiveDirectiveId : receiveDirectiveIds) {
- User user = userService.getById(receiveDirectiveId);
- builder.append(user.getRealName()).append(",");
- }
- //查询图片
- List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
- if (directiveFiles.size()>0){
- StringBuilder builderFile = new StringBuilder();
- for (DirectiveFile directiveFile : directiveFiles) {
- builderFile.append(directiveFile.getUrl()).append(",");
+ if (records.size()>0) {
+ for (DirectiveVo record : records) {
+ String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
+ StringBuilder builder = new StringBuilder();
+ for (String receiveDirectiveId : receiveDirectiveIds) {
+ User user = userService.getById(receiveDirectiveId);
+ if (null!=user) {
+ builder.append(user.getRealName()).append(",");
+ }
}
- record.setUrl(builder.toString().substring(0, builderFile.toString().length() - 1));
+ //查询图片
+ List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
+ if (directiveFiles.size() > 0) {
+ StringBuilder builderFile = new StringBuilder();
+ for (DirectiveFile directiveFile : directiveFiles) {
+ builderFile.append(directiveFile.getUrl()).append(",");
+ }
+ String urls = builderFile.toString();
+ record.setUrl(urls.substring(0, urls.length() - 1));
+ }
+ if (!"".equals(builder.toString())) {
+ record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
+ //如果查询接收人
+ if (null!=directive.getReceiveName() && directive.getReceiveName()!=""){
+ //不匹配就删除
+ if (!record.getReceiveName().contains(directive.getReceiveName())){
+ records.remove(record);
+ }
+ }
+ }
}
- record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
}
return directiveVoIPage;
}
@@ -91,4 +105,35 @@
public int deleleByDirectiveId(Long id) {
return baseMapper.deleteByDirectiveId(id);
}
+
+ /**
+ * 自定义分页--接收到的指令
+ * @param page,size
+ * @param directive 指令对象
+ */
+ @Override
+ public IPage<DirectiveVo> selectDirectiveReplyPage(IPage<DirectiveVo> page, DirectiveVo directive) {
+ IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectiveReplyPage(page, directive));
+ List<DirectiveVo> records = directiveVoIPage.getRecords();
+ for (DirectiveVo record : records) {
+// String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
+// StringBuilder builder = new StringBuilder();
+// for (String receiveDirectiveId : receiveDirectiveIds) {
+// User user = userService.getById(receiveDirectiveId);
+// builder.append(user.getRealName()).append(",");
+// }
+ //查询图片
+ List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
+ if (directiveFiles.size()>0){
+ StringBuilder builderFile = new StringBuilder();
+ for (DirectiveFile directiveFile : directiveFiles) {
+ builderFile.append(directiveFile.getUrl()).append(",");
+ }
+ String urls = builderFile.toString();
+ record.setUrl(urls.substring(0, urls.length() - 1));
+ }
+// record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
+ }
+ return directiveVoIPage;
+ }
}
--
Gitblit v1.9.3