yxt_develop
/
message-center
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善催办统计列表条件筛选逻辑

master
fanzongzhe 2 years ago
parent
9f8bf9e5a9
commit
1c7aeaaf9b
1 changed files with 85 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java

100
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java
View File

@ -29,6 +29,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import static java.util.stream.Collectors.toList;
/**
* @description:
* @author: dimengzhe
@ -339,33 +341,101 @@ public class MessageUrgeListService extends MybatisBaseService<MessageUrgeListMa
}
}
}
listStartTime.removeAll(listName);
listStartTime.addAll(listName);
listStartTime.removeAll(listUseTime);
listStartTime.addAll(listUseTime);
listStartTime.removeAll(listSysCount);
listStartTime.addAll(listSysCount);
//-------------------------------
// listStartTime.removeAll(listName);
// listStartTime.addAll(listName);
// listStartTime.removeAll(listUseTime);
// listStartTime.addAll(listUseTime);
// listStartTime.removeAll(listSysCount);
// listStartTime.addAll(listSysCount);
//------------------
List<MessageUrgeListVo> finailList = new ArrayList<>();
if (!listStartTime.isEmpty() && listName.isEmpty() && listUseTime.isEmpty() && listSysCount.isEmpty()) {
finailList.addAll(listStartTime);
} else if (listStartTime.isEmpty() && !listName.isEmpty() && listUseTime.isEmpty() && listSysCount.isEmpty()) {
finailList.addAll(listName);
} else if (listStartTime.isEmpty() && listName.isEmpty() && !listUseTime.isEmpty() && listSysCount.isEmpty()) {
finailList.addAll(listUseTime);
} else if (listStartTime.isEmpty() && listName.isEmpty() && listUseTime.isEmpty() && !listSysCount.isEmpty()) {
finailList.addAll(listSysCount);
} else if (!listStartTime.isEmpty() && !listName.isEmpty() && listUseTime.isEmpty() && listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listStartTime.stream().filter(item -> listName.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (!listStartTime.isEmpty() && listName.isEmpty() && !listUseTime.isEmpty() && listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listStartTime.stream().filter(item -> listUseTime.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (!listStartTime.isEmpty() && listName.isEmpty() && listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listStartTime.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (listStartTime.isEmpty() && !listName.isEmpty() && !listUseTime.isEmpty() && listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listName.stream().filter(item -> listUseTime.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (listStartTime.isEmpty() && !listName.isEmpty() && listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listName.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (listStartTime.isEmpty() && listName.isEmpty() && !listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listUseTime.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaoJi);
} else if (!listStartTime.isEmpty() && !listName.isEmpty() && !listUseTime.isEmpty() && listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listStartTime.stream().filter(item -> listName.contains(item)).collect(toList());
List<MessageUrgeListVo> jiaoJi2 = jiaoJi.stream().filter(item -> listUseTime.contains(item)).collect(toList());
finailList.addAll(jiaoJi2);
} else if (!listStartTime.isEmpty() && listName.isEmpty() && !listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listStartTime.stream().filter(item -> listUseTime.contains(item)).collect(toList());
List<MessageUrgeListVo> jiaoJi2 = jiaoJi.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaoJi2);
} else if (listStartTime.isEmpty() && !listName.isEmpty() && !listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaoJi = listName.stream().filter(item -> listUseTime.contains(item)).collect(toList());
List<MessageUrgeListVo> jiaoJi2 = jiaoJi.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaoJi2);
} else if (!listStartTime.isEmpty() && !listName.isEmpty() && !listUseTime.isEmpty() && !listSysCount.isEmpty()) {
List<MessageUrgeListVo> jiaojiA = listStartTime.stream().filter(item -> listName.contains(item)).collect(toList());
List<MessageUrgeListVo> jiaojiB = jiaojiA.stream().filter(item -> listUseTime.contains(item)).collect(toList());
List<MessageUrgeListVo> jiaojiC = jiaojiB.stream().filter(item -> listSysCount.contains(item)).collect(toList());
finailList.addAll(jiaojiC);
}
if (StringUtils.isBlank(params.getSysCount())
&& StringUtils.isBlank(params.getApplyName())
&& StringUtils.isBlank(params.getUseTime())
&& StringUtils.isBlank(params.getEndTime())
&& StringUtils.isBlank(params.getStartTime())) {
listStartTime.removeAll(Collections.singleton(null));
listStartTime.addAll(records);
finailList.removeAll(Collections.singleton(null));
finailList.addAll(records);
}
if (StringUtils.isNotBlank(params.getStartTime()) || StringUtils.isNotBlank(params.getEndTime())) {
if (listStartTime.isEmpty()) {
finailList = new ArrayList<>();
}
}
if (StringUtils.isNotBlank(params.getApplyName())) {
if (listName.isEmpty()) {
finailList = new ArrayList<>();
}
}
if (!listStartTime.isEmpty()) {
List<MessageUrgeListVo> lastList = this.pageBySubList(listStartTime, (int) pq.getSize(), (int) pq.getCurrent());
if (StringUtils.isNotBlank(params.getUseTime())) {
if (listUseTime.isEmpty()) {
finailList = new ArrayList<>();
}
}
if (StringUtils.isNotBlank(params.getSysCount())) {
if (listSysCount.isEmpty()) {
finailList = new ArrayList<>();
}
}
if (!finailList.isEmpty()) {
List<MessageUrgeListVo> lastList = this.pageBySubList(finailList, (int) pq.getSize(), (int) pq.getCurrent());
lastList.sort((t1, t2) -> t2.getStartTime().compareTo(t1.getStartTime()));
pagerVo.setRecords(lastList);
pagerVo.setTotal(listStartTime.size());
pagerVo.setTotal(finailList.size());
pagerVo.setCurrent(pq.getCurrent());
pagerVo.setSize(pq.getSize());
if (listStartTime.size() % pq.getSize() != 0L) {
pagerVo.setPages((listStartTime.size() / pq.getSize()) + 1);
if (finailList.size() % pq.getSize() != 0L) {
pagerVo.setPages((finailList.size() / pq.getSize()) + 1);
} else {
pagerVo.setPages(listStartTime.size() / pq.getSize());
pagerVo.setPages(finailList.size() / pq.getSize());
}
pagerVo.setMsg("当前共查询到" + listStartTime.size() + "条记录");
pagerVo.setMsg("当前共查询到" + finailList.size() + "条记录");
}
}
return pagerVo;

Write Preview
Loading…
Cancel
Save