|
|
@@ -46,6 +46,7 @@ import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
|
|
|
@@ -1221,7 +1222,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
public Pagination<OutMemberList> memberList(InputMemberList in) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
addParam(in, map);
|
|
|
- return (Pagination<OutMemberList>) findPage("findMemberList","findMemberCount",map,in.getPageNo(), in.getPageSize());
|
|
|
+ Pagination<OutMemberList> page = (Pagination<OutMemberList>) findPage("findMemberList", "findMemberCount", map, in.getPageNo(), in.getPageSize());
|
|
|
+ List<OutMemberList> list = (List<OutMemberList>) page.getList();
|
|
|
+ pushMyExamine(list);
|
|
|
+ return page;
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushMyExamine(List<OutMemberList> list) {
|
|
|
+ List<Integer> ids =list.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
|
+ List<TOrderExamine> examineList = tOrderExamineMapper.selectExamineBytidAndAid(ids, TokenManager.getAdminId());
|
|
|
+ list=list.stream().map(e -> {
|
|
|
+ examineList.forEach(ex -> {
|
|
|
+ if(e.getId().equals(ex.getTid())) {
|
|
|
+ if (ex.getStatus() == 1) {
|
|
|
+ e.setMyExamine(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ if (e.getMyExamine()==null){
|
|
|
+ e.setMyExamine(0);
|
|
|
+ }
|
|
|
+ return e;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
private void addParam(InputMemberList in, HashMap<String, Object> map) {
|