Browse Source

管理员新增、修改接口,上级与抄送对象修改为多个

anderx 9 months ago
parent
commit
b010ed4fa4

+ 40 - 0
src/main/java/com/goafanti/admin/bo/AdminReviewer.java

@@ -0,0 +1,40 @@
+package com.goafanti.admin.bo;
+
+public class AdminReviewer {
+    private String publicReviewerIds;
+    private String assistReviewerIds;
+    private String superReviewerIds;
+    private String carbonCopyReviewerIds;
+
+    public String getPublicReviewerIds() {
+        return publicReviewerIds;
+    }
+
+    public void setPublicReviewerIds(String publicReviewerIds) {
+        this.publicReviewerIds = publicReviewerIds;
+    }
+
+    public String getAssistReviewerIds() {
+        return assistReviewerIds;
+    }
+
+    public void setAssistReviewerIds(String assistReviewerIds) {
+        this.assistReviewerIds = assistReviewerIds;
+    }
+
+    public String getSuperReviewerIds() {
+        return superReviewerIds;
+    }
+
+    public void setSuperReviewerIds(String superReviewerIds) {
+        this.superReviewerIds = superReviewerIds;
+    }
+
+    public String getCarbonCopyReviewerIds() {
+        return carbonCopyReviewerIds;
+    }
+
+    public void setCarbonCopyReviewerIds(String carbonCopyReviewerIds) {
+        this.carbonCopyReviewerIds = carbonCopyReviewerIds;
+    }
+}

+ 5 - 4
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.AdminLocationBo;
+import com.goafanti.admin.bo.AdminReviewer;
 import com.goafanti.admin.service.AdminLocationService;
 import com.goafanti.admin.service.NewAdminService;
 import com.goafanti.common.bo.Result;
@@ -67,7 +68,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
 	public Result insertAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
-							   String publicReviewerIds,String assistReviewerIds) {
+							  AdminReviewer adminReviewer) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		List<String> roles = new ArrayList<String>();
@@ -112,7 +113,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				ad.setPassword(AFTConstants.INITIALPASSWORD);
 			}
 			ad.setPassword(passwordUtil.getEncryptPwd(ad));
-			res.setData(newAdminService.insertNewAdmin(ad,roles,publicReviewerIds,assistReviewerIds));
+			res.setData(newAdminService.insertNewAdmin(ad,roles,  adminReviewer));
 		}
 		return res;
 	}
@@ -122,7 +123,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
 	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
-							  String publicReviewerIds,String assistReviewerIds) {
+							  AdminReviewer adminReviewer) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		List<String> roles = new ArrayList<String>();
@@ -175,7 +176,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 			if (!useAdmin.getStatus().equals(ad.getStatus())&&!ad.getStatus().equals("0")){
 				redisUtil.deleteAid(aa.getId());
 			}
-			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles,publicReviewerIds,assistReviewerIds));
+			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles,adminReviewer));
 		}
 		return res;
 	}

+ 3 - 2
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -2,6 +2,7 @@ package com.goafanti.admin.service;
 
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.admin.bo.AdminReviewer;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -19,7 +20,7 @@ public interface NewAdminService {
 
 	int insert(Admin ad);
 
-	int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds ,String publicReviewerIds,String assistReviewerIds);
+	int updateByPrimaryKeySelective(Admin ad, Admin useAdmin, List<String> roleIds , AdminReviewer adminReviewer);
 
 	int updateByPrimaryKey(Admin a);
 
@@ -55,7 +56,7 @@ public interface NewAdminService {
 
 	Map<String, String> selectTechBroder();
 
-	int insertNewAdmin(Admin ad, List<String> roleIds,String publicReviewerIds,String assistReviewerIds);
+	int insertNewAdmin(Admin ad, List<String> roleIds, AdminReviewer adminReviewer);
 
 	Map<String, String> listAdminSelect();
 

+ 12 - 6
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -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;
 	}