Commit 4050a5b1 authored by 赵啸非's avatar 赵啸非

添加窗口编码

parent 396c6c59
...@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD ...@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
ownerList.addAll(subTwoList); ownerList.addAll(subTwoList);
if (!ObjectUtils.isEmpty(pdu.getHallId())) { if (!ObjectUtils.isEmpty(pdu.getHallId())) {
ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected)).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList()); ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected).reversed()).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
} }
...@@ -209,10 +209,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD ...@@ -209,10 +209,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
@Override @Override
public Rest<List<String>> getPerformMonthList(Context context) { public Rest<List<String>> getPerformMonthList(Context context) {
Set<String> collectSet = new HashSet<>(); Set<String> collectSet = new HashSet<>();
//查询所有窗口汇总表 //查询所有窗口汇总表
WindowPerformQuery windowPerformQuery = new WindowPerformQuery(); WindowPerformQuery windowPerformQuery = new WindowPerformQuery();
windowPerformQuery.setOwnerId(context.getUser().getCustomerId()); windowPerformQuery.setOwnerId(context.getUser().getCustomerId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment