添加窗口编码

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java

@@ -65,8 +65,9 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
 
     @Override
     public List<WindowPdu> subWindowPduList(WindowPdu pdu) {
-        List<WindowPdu> subList = new ArrayList<>();
         List<WindowPdu> ownerList = new ArrayList<>();
+        List<WindowPdu> subList = new ArrayList<>();
+        List<WindowPdu> subTwoList = new ArrayList<>();
         List<WindowOwnerDetailEntity> ownerDetail = windowOwnerDetailService.getAllList();
         if (!CollectionUtils.isEmpty(ownerDetail)) {
             Long[] windows = ownerDetail.stream().map(WindowOwnerDetailEntity::getWindowId).toArray(Long[]::new);
@@ -91,13 +92,16 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                     ownerWindowPdu.setIdList(Arrays.asList(windowIds));
                     Rest<RespData<List<WindowPdu>>> ownerRest = windowFeign.list(ownerWindowPdu);
                     if (ownerRest.getCode() == YesNoEnum.YES.getValue()) {
-                        ownerList = ownerRest.getData().getData();
+                        ownerRest.getData().getData().stream().forEach(item->{
+                            item.setSelected(YesNoEnum.YES.getValue());
+                        });
+                        subTwoList = ownerRest.getData().getData();
                     }
                 }
             }
         }
-
         ownerList.addAll(subList);
+        ownerList.addAll(subTwoList);
         return ownerList;
     }
 

common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java

@@ -94,9 +94,15 @@ public class WindowPdu extends BaseEntityLong {
      */
     private String hallName;
 
-    /** 序号，主键，自增长排除列表 */
+    /**
+     * 序号，主键，自增长排除列表
+     */
     private List<Long> idNotList;
 
     private List<Long> idList;
+    /**
+     * 0未选中 1选中 默认为0
+     */
+    private Integer selected = 0;
 
 }