兴安列表优化

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java

@@ -143,10 +143,23 @@ public class VisCarryStuffController  extends BaseController {
             }
         });
 
+        //查询放行保安名字
+        VisExitOutRecordVo visExitOutRecordVo = new VisExitOutRecordVo();
+        visExitOutRecordVo.setExitIds(collect);
+        List<VisExitOutRecordVo> rList = visExitOutRecordService.selectList(visExitOutRecordVo);
+        Map<Long, String> map1 = new HashMap<>();
+        if (CollUtil.isNotEmpty(rList)) {
+            map1 = rList.stream().collect(Collectors.toMap(VisExitOutRecordVo::getExitId, VisExitOutRecordVo::getUserName, (key1, key2) -> key1));
+        }
+
         //构造数据
         Map<Long, List<VisStuffInfoVo>> collect1 = stuffList.stream().collect(Collectors.groupingBy(VisStuffInfoVo::getExitId));
+        Map<Long, String> finalMap = map1;
         list.forEach(exit -> {
             exit.setVisStuffInfoList(collect1.get(exit.getId()));
+            if (null != finalMap.get(exit.getId())) {
+                exit.setReleaseName(finalMap.get(exit.getId()));
+            }
         });
 
         return getDataTable(list);

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutRecordVo.java

@@ -18,6 +18,11 @@ public class VisExitOutRecordVo extends BaseEntity {
      */
     private Long exitId;
 
+    /**
+     * 出门证主键ids
+     */
+    private List<Long> exitIds;
+
 
     /**
      * 放行人（保安）

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java

@@ -129,6 +129,11 @@ public class VisExitOutVo extends BaseEntity {
      */
     private String state;
 
+    /**
+     * 放行人名字
+     */
+    private String releaseName;
+
     /**
      * 申请类型 0:临时访客 1：携物出门
      */