|
@@ -576,7 +576,7 @@ public class VisitorMainService extends SuperPermissService {
|
|
|
List<VisitorMain> list = page.getContent();
|
|
List<VisitorMain> list = page.getContent();
|
|
|
List<Map<String, Object>> maps = new ArrayList<>();
|
|
List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
if (ObjectUtils.isNotEmpty(list)) {
|
|
if (ObjectUtils.isNotEmpty(list)) {
|
|
|
- maps = list.stream().map(it -> {
|
|
|
|
|
|
|
+ maps = list.parallelStream().map(it -> {
|
|
|
Map<String, Object> map = BeanUtil.bean2Map(it);
|
|
Map<String, Object> map = BeanUtil.bean2Map(it);
|
|
|
String visitorTypeName = dictionaryService.queryItemName(it.getProjectOid(), "visitorType", it.getVisitorType());
|
|
String visitorTypeName = dictionaryService.queryItemName(it.getProjectOid(), "visitorType", it.getVisitorType());
|
|
|
map.put("visitorTypeName", visitorTypeName);
|
|
map.put("visitorTypeName", visitorTypeName);
|
|
@@ -614,6 +614,7 @@ public class VisitorMainService extends SuperPermissService {
|
|
|
map.put("visitorUserName", visitorUserName);
|
|
map.put("visitorUserName", visitorUserName);
|
|
|
map.put("visitorUserPhone", visitorUserPhone);
|
|
map.put("visitorUserPhone", visitorUserPhone);
|
|
|
|
|
|
|
|
|
|
+ // 申请方式
|
|
|
String applyTypeStr = "";
|
|
String applyTypeStr = "";
|
|
|
if (it.getApplyType() != null) {
|
|
if (it.getApplyType() != null) {
|
|
|
applyTypeStr = it.getApplyType().getRemark();
|
|
applyTypeStr = it.getApplyType().getRemark();
|