|
|
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements NewAdminService {
|
|
|
@@ -74,8 +75,12 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
@Override
|
|
|
public Object publicReviewer(String id) {
|
|
|
List<AdminPublicReviewerBo> list = adminPublicReviewerMapper.selectByAid(id);
|
|
|
- list.stream().filter(AdminPublicReviewer::getType==1)
|
|
|
- return list;
|
|
|
+ List<AdminPublicReviewerBo> collect = list.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ List<AdminPublicReviewerBo> collect2 = list.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("publicReviewer", collect);
|
|
|
+ map.put("assistReviewer", collect2);
|
|
|
+ return map;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -100,7 +105,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unused")
|
|
|
@Override
|
|
|
- public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds,String reviewerIds) {
|
|
|
+ public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds,String publicReviewerIds,String assistReviewerIds) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("uid", ad.getId());
|
|
|
params.put("roles", roleIds);
|
|
|
@@ -118,7 +123,8 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
//
|
|
|
asyncUtils.pushRoleUpdateExamine(ad,useAdmin,roleIds,useRole);
|
|
|
//修改公出审核人
|
|
|
- if(reviewerIds!=null)updatePublicReviewer(ad.getId(),reviewerIds);
|
|
|
+ if(publicReviewerIds!=null)updatePublicReviewer(ad.getId(),publicReviewerIds,0);
|
|
|
+ if(assistReviewerIds!=null)updatePublicReviewer(ad.getId(),assistReviewerIds,1);
|
|
|
pushAmbRole(ad);
|
|
|
if (count>0&&ad.getAmbId()!=null){
|
|
|
//进行巴人数计算
|
|
|
@@ -131,9 +137,11 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
- private void updatePublicReviewer(String aid ,String reviewerIds) {
|
|
|
+ private void updatePublicReviewer(String aid ,String reviewerIds,Integer type) {
|
|
|
String[] split = reviewerIds.split(",");
|
|
|
List<AdminPublicReviewerBo> list = adminPublicReviewerMapper.selectByAid(aid);
|
|
|
+ if (type==0)list=list.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ else list=list.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
//
|
|
|
for (AdminPublicReviewerBo e : list) {
|
|
|
boolean flag = false;
|
|
|
@@ -153,10 +161,11 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
flag = true;
|
|
|
}
|
|
|
}
|
|
|
- if (!flag){
|
|
|
+ if (!flag&&StringUtils.isNotBlank(s)){
|
|
|
AdminPublicReviewer adminPublicReviewer = new AdminPublicReviewer();
|
|
|
adminPublicReviewer.setAid(aid);
|
|
|
adminPublicReviewer.setReviewerId(s);
|
|
|
+ adminPublicReviewer.setType(type);
|
|
|
adminPublicReviewer.setCreateTime(new Date());
|
|
|
adminPublicReviewerMapper.insert(adminPublicReviewer);
|
|
|
}
|