Merge remote-tracking branch 'origin/master'

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);
@@ -85,19 +86,28 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                 //查询当前负责人负责的窗口
                 WindowOwnerDetailQuery detailQuery = new WindowOwnerDetailQuery();
                 detailQuery.setOwnerId(pdu.getStaffId());
-                Long[] windowIds = windowOwnerDetailService.find(detailQuery).stream().map(WindowOwnerDetailEntity::getId).toArray(Long[]::new);
+                Long[] windowIds = windowOwnerDetailService.find(detailQuery).stream().map(WindowOwnerDetailEntity::getWindowId).toArray(Long[]::new);
                 if (!ObjectUtils.isEmpty(windowIds)) {
                     WindowPdu ownerWindowPdu = new WindowPdu();
                     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);
+
+        if (!ObjectUtils.isEmpty(pdu.getHallId())) {
+            ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected).reversed()).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
+        }
+
+
         return ownerList;
     }
 
@@ -199,10 +209,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
 
     @Override
     public Rest<List<String>> getPerformMonthList(Context context) {
-
-
         Set<String> collectSet = new HashSet<>();
-
         //查询所有窗口汇总表
         WindowPerformQuery windowPerformQuery = new WindowPerformQuery();
         windowPerformQuery.setOwnerId(context.getUser().getCustomerId());

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

@@ -26,10 +26,7 @@ import com.mortals.xhx.module.window.service.WindowPerformService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -125,7 +122,7 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
 
     @Override
     public Rest<List<WindowPerformAllVo>> getAllList(WindowPerformQuery query, Context context) {
-        ArrayList<WindowPerformAllVo> allList = new ArrayList<>();
+        List<WindowPerformAllVo> allList = new ArrayList<>();
         query.setOwnerId(context.getUser().getCustomerId());
         List<WindowPerformEntity> windowPerformEntities = this.find(query, context);
         if (!ObjectUtils.isEmpty(windowPerformEntities)) {
@@ -157,6 +154,10 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
             }).collect(Collectors.toList());
             allList.addAll(collect);
         }
+
+       allList = allList.stream().sorted(Comparator.comparing(WindowPerformAllVo::getFillDate)).collect(Collectors.toList());
+
+
         return Rest.ok(allList);
     }
 }
\ No newline at end of file

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;
 
 }