添加大厅与窗口关联

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowHallVo.java

 package com.mortals.xhx.module.window.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
+
 /**
-* 大厅窗口视图对象
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * 大厅窗口视图对象
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
 @Data
 public class WindowHallVo extends BaseEntityLong {
 
 
+    private String fromnum;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowHallServiceImpl.java

 package com.mortals.xhx.module.window.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.window.model.WindowEntity;
+import com.mortals.xhx.module.window.model.WindowQuery;
+import com.mortals.xhx.module.window.service.WindowService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,14 +13,44 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.window.dao.WindowHallDao;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
 import com.mortals.xhx.module.window.service.WindowHallService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
-* WindowHallService
-* 大厅窗口 service实现
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * WindowHallService
+ * 大厅窗口 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
 @Service("windowHallService")
 public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
-    
+
+    @Autowired
+    private WindowService windowService;
+
+    /**
+     * @param params
+     * @param pageInfo
+     * @param context
+     * @param list
+     * @throws AppException
+     */
+    @Override
+    protected void findAfter(WindowHallEntity params, PageInfo pageInfo, Context context, List<WindowHallEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
+        List<Long> collect = list.stream().map(i -> i.getWindowId()).distinct().collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(collect)) {
+            WindowQuery windowQuery = new WindowQuery();
+            windowQuery.setIdList(collect);
+            Map<Long, WindowEntity> collectWin = windowService.find(windowQuery).stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
+            list.forEach(item -> {
+                WindowEntity windowEntity = collectWin.get(item.getWindowId());
+                item.setFromnum(windowEntity == null ? "" : windowEntity.getFromnum());
+            });
+        }
+    }
 }
\ No newline at end of file