|
@@ -34,12 +34,12 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
|
|
|
private UserFirstInterviewMapper userFirstInterviewMapper;
|
|
private UserFirstInterviewMapper userFirstInterviewMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
private UserDataLogMapper userDataLogMapper;
|
|
private UserDataLogMapper userDataLogMapper;
|
|
|
- @Resource
|
|
|
|
|
- private OrganizationIdentityMapper organizationIdentityMapper;
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<UserArchivesInterview> list(UserArchivesInterview userArchivesInterview, Integer pageNo, Integer pageSize) {
|
|
public Pagination<UserArchivesInterview> list(UserArchivesInterview userArchivesInterview, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
+ userArchivesInterview.setAid(TokenManager.getAdminId());
|
|
|
params.put("in", userArchivesInterview);
|
|
params.put("in", userArchivesInterview);
|
|
|
return (Pagination<UserArchivesInterview>) findPage("findUserArchivesInterviewList",
|
|
return (Pagination<UserArchivesInterview>) findPage("findUserArchivesInterviewList",
|
|
|
"findUserArchivesInterviewCount", params, pageNo, pageSize);
|
|
"findUserArchivesInterviewCount", params, pageNo, pageSize);
|
|
@@ -218,7 +218,20 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-private Map<String, List<OutPublicAidUid>> groupByAid(List<OutPublicAidUid> publicReleases) {
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Object selectByPrdid(Integer prdid) {
|
|
|
|
|
+ Map<String ,Object> res = new HashMap<>();
|
|
|
|
|
+ UserArchivesInterview uai = userArchivesInterviewMapper.selectByPrdid(prdid);
|
|
|
|
|
+ if (uai!=null){
|
|
|
|
|
+ res.put("data",uai);
|
|
|
|
|
+ List<UserArchivesInterview> list = userArchivesInterviewMapper.selectByUidAid(uai.getUid(), uai.getAid());
|
|
|
|
|
+ List<UserArchivesInterview> collect = list.stream().filter(e -> !e.getId().equals(uai.getId())).collect(Collectors.toList());
|
|
|
|
|
+ res.put("list",collect);
|
|
|
|
|
+ }
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private Map<String, List<OutPublicAidUid>> groupByAid(List<OutPublicAidUid> publicReleases) {
|
|
|
return publicReleases.stream()
|
|
return publicReleases.stream()
|
|
|
.filter(Objects::nonNull) // 过滤掉空对象
|
|
.filter(Objects::nonNull) // 过滤掉空对象
|
|
|
.collect(Collectors.groupingBy(OutPublicAidUid::getAid));
|
|
.collect(Collectors.groupingBy(OutPublicAidUid::getAid));
|