|
|
@@ -3,6 +3,7 @@ package com.goafanti.admin.service.impl;
|
|
|
import com.goafanti.admin.bo.AdminDetail;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.admin.bo.AdminPublicReviewerBo;
|
|
|
+import com.goafanti.admin.bo.AdminReviewer;
|
|
|
import com.goafanti.admin.service.NewAdminService;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
@@ -109,7 +110,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unused")
|
|
|
@Override
|
|
|
- public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds,String publicReviewerIds,String assistReviewerIds) {
|
|
|
+ public int updateByPrimaryKeySelective(Admin ad, Admin useAdmin, List<String> roleIds, AdminReviewer adminReviewer) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("uid", ad.getId());
|
|
|
params.put("roles", roleIds);
|
|
|
@@ -130,8 +131,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
//
|
|
|
asyncUtils.pushRoleUpdateExamine(ad,useAdmin,roleIds,useRole);
|
|
|
//修改公出审核人
|
|
|
- if(publicReviewerIds!=null)updatePublicReviewer(ad.getId(),publicReviewerIds,0);
|
|
|
- if(assistReviewerIds!=null)updatePublicReviewer(ad.getId(),assistReviewerIds,1);
|
|
|
+ updateReviewer(ad, adminReviewer);
|
|
|
pushAmbRole(ad);
|
|
|
//统计团队更换每天统计表
|
|
|
if (useAdmin.getTeamId()!=null&&!useAdmin.getTeamId().equals(ad.getTeamId())){
|
|
|
@@ -149,6 +149,13 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
+ private void updateReviewer(Admin ad, AdminReviewer adminReviewer) {
|
|
|
+ if(adminReviewer.getPublicReviewerIds()!=null)updatePublicReviewer(ad.getId(), adminReviewer.getPublicReviewerIds(),0);
|
|
|
+ if(adminReviewer.getAssistReviewerIds()!=null)updatePublicReviewer(ad.getId(), adminReviewer.getAssistReviewerIds(),1);
|
|
|
+ if(adminReviewer.getSuperReviewerIds()!=null)updatePublicReviewer(ad.getId(), adminReviewer.getSuperReviewerIds(),2);
|
|
|
+ if(adminReviewer.getCarbonCopyReviewerIds()!=null)updatePublicReviewer(ad.getId(), adminReviewer.getCarbonCopyReviewerIds(),3);
|
|
|
+ }
|
|
|
+
|
|
|
private void updatePublicReviewer(String aid ,String reviewerIds,Integer type) {
|
|
|
String[] split = reviewerIds.split(",");
|
|
|
List<AdminPublicReviewerBo> list = adminPublicReviewerMapper.selectByAid(aid);
|
|
|
@@ -299,7 +306,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int insertNewAdmin(Admin ad ,List<String> roleIds,String publicReviewerIds,String assistReviewerIds) {
|
|
|
+ public int insertNewAdmin(Admin ad ,List<String> roleIds,AdminReviewer adminReviewer) {
|
|
|
ad.setStatus("0");
|
|
|
ad.setId(UUID.randomUUID().toString());
|
|
|
ad.setType(sumType(roleIds));
|
|
|
@@ -318,8 +325,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
if(ad.getAmbId()!=null)pushAmbRole(ad);
|
|
|
//修改公出审核人
|
|
|
- if(publicReviewerIds!=null)updatePublicReviewer(ad.getId(),publicReviewerIds,0);
|
|
|
- if(assistReviewerIds!=null)updatePublicReviewer(ad.getId(),assistReviewerIds,1);
|
|
|
+ updateReviewer(ad, adminReviewer);
|
|
|
adminMapper.insert(ad);
|
|
|
return 1;
|
|
|
}
|