From 1ceb6ae074bc40a687852ce0fcef1ff2aa9c5840 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 17:29:37 +0800
Subject: [PATCH] 1.客户列表接口修改，新增返回字段 deptName 2.删除 system.out... 以往语句
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 0fbfe87..da4f6ab 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -16,6 +16,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
import static org.springblade.core.tool.utils.DateUtil.now;
@@ -24,7 +25,7 @@
* 包裹服务实现层
*/
@Service
-public class ParcelServiceImpl implements ParcelService {
+public class ParcelServiceImpl implements ParcelService{
@Value("${PARCEL_KEY}")
private String PARCEL_KEY;
@@ -349,7 +350,6 @@
map.put("imgKey",imgKey);
//执行http远程调用
String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
- System.out.println("s = " + s);
if (null==s || s=="" || s.isEmpty()){
return null;
}
@@ -684,8 +684,7 @@
*/
@Override
public List<ParcelExcel> exportParcel(ConditionVo conditionVo) {
- System.out.println("conditionVo = " + conditionVo);
- ArrayList<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
+ List<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
//设置页码数
conditionVo.setCurrentPage(1);
conditionVo.setPageSize(100);
@@ -710,7 +709,6 @@
}
//合并集合
List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("parcelExcels = " + parcelExcels);
return parcelExcels;
}
return null;
@@ -865,4 +863,5 @@
}
return list;
}
+
}
--
Gitblit v1.9.3