添加窗口编码

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

@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
         ownerList.addAll(subTwoList);
 
         if (!ObjectUtils.isEmpty(pdu.getHallId())) {
-            ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected).reversed()).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
+            ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected)).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
         }
 
 
@@ -237,4 +237,20 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
     }
 
 
+    @Override
+    protected void removeBefore(Long[] ids, Context context) throws AppException {
+        super.removeBefore(ids, context);
+        //删除窗口人员
+        List<WindowOwnerEntity> windowOwnerEntities = this.get(ids, context);
+        List<Long> collect = windowOwnerEntities.stream().map(item -> item.getWindowId()).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(collect)) {
+            WindowOwnerDetailQuery detailQuery = new WindowOwnerDetailQuery();
+            detailQuery.ownerIdList(collect);
+            Long[] delIds = windowOwnerDetailService.find(detailQuery).stream().map(item -> item.getId()).toArray(Long[]::new);
+            if (!ObjectUtils.isEmpty(delIds)) {
+                windowOwnerDetailService.remove(delIds, context);
+            }
+        }
+
+    }
 }
\ No newline at end of file