From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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..fb10eff 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
@@ -51,7 +51,8 @@
for (DirectiveFile directiveFile : directiveFiles) {
builderFile.append(directiveFile.getUrl()).append(",");
}
- record.setUrl(builder.toString().substring(0, builderFile.toString().length() - 1));
+ String urls = builderFile.toString();
+ record.setUrl(urls.substring(0, urls.length() - 1));
}
record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
}
@@ -91,4 +92,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