From 6038dbee0781f023397d36c3f27d92a0ac9b8bc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:41:19 +0800
Subject: [PATCH] 审查接口修改，装备字段新增，指令查询接口修改
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 35 +++++++++++++++++++----------------
src/main/java/org/springblade/modules/equipage/entity/Equipage.java | 6 ++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 19 ++++++++++++-------
3 files changed, 37 insertions(+), 23 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 fb10eff..00bc1bd 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,24 +37,27 @@
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(",");
+ System.out.println("records = " + records);
+ 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);
+ builder.append(user.getRealName()).append(",");
}
- String urls = builderFile.toString();
- record.setUrl(urls.substring(0, urls.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));
+ }
+ record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
}
- record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
}
return directiveVoIPage;
}
diff --git a/src/main/java/org/springblade/modules/equipage/entity/Equipage.java b/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
index fb6929c..2d7c12d 100644
--- a/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
+++ b/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
@@ -73,6 +73,12 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date dateForProduction;
+ /**
+ * 责任人id
+ */
+ @TableField("user_id")
+ private Long userId;
+
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 72da4bb..45e3873 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -155,15 +155,20 @@
Object data1 = jsonObject.get("data");
JSONObject jsonObject1 = JSONObject.parseObject(data1.toString());
List<Map<String,Object>> res = (List<Map<String,Object>>)jsonObject1.get("res");
- int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
- res.forEach(map -> {
- if (null!=map.get("zdxsfzqkry")){
- user.setExaminationMx(map.get("zdxsfzqkry").toString());
+ if(res.size()>0) {
+ int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
+ res.forEach(map -> {
+ if (null != map.get("zdxsfzqkry")) {
+ user.setExaminationMx(map.get("zdxsfzqkry").toString());
+ }
+ });
+ if (count > 0) {
+ user.setExaminationType("1");
+ } else {
+ user.setExaminationType("0");
}
- });
- if (count>0){
- user.setExaminationType("1");
}else {
+ //没有数据正常
user.setExaminationType("0");
}
return R.status(userService.submit(user));
--
Gitblit v1.9.3