Просмотр исходного кода

新增多人公出审核
新增多人协单审核

anderx 1 год назад
Родитель
Сommit
21c33303ee

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.AdminLocationBo;
 import com.goafanti.admin.bo.AdminLocationBo;
-import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.admin.service.AdminLocationService;
 import com.goafanti.admin.service.AdminLocationService;
 import com.goafanti.admin.service.NewAdminService;
 import com.goafanti.admin.service.NewAdminService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
@@ -122,7 +121,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 */
 	 */
 	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
 	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
 	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
 	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
-							  String reviewerIds) {
+							  String publicReviewerIds,String assistReviewerIds) {
 		Result res = new Result();
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		List<String> roles = new ArrayList<String>();
 		List<String> roles = new ArrayList<String>();
@@ -175,7 +174,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 			if (!useAdmin.getStatus().equals(ad.getStatus())&&!ad.getStatus().equals("0")){
 			if (!useAdmin.getStatus().equals(ad.getStatus())&&!ad.getStatus().equals("0")){
 				redisUtil.deleteAid(aa.getId());
 				redisUtil.deleteAid(aa.getId());
 			}
 			}
-			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles,reviewerIds));
+			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles,publicReviewerIds,assistReviewerIds));
 		}
 		}
 		return res;
 		return res;
 	}
 	}
@@ -328,7 +327,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/publicReviewer", method = RequestMethod.GET)
 	@RequestMapping(value = "/publicReviewer", method = RequestMethod.GET)
-	public Result<List<AdminPublicReviewerBo>> publicReviewer(String id){
+	public Result publicReviewer(String id){
 		Result res = new Result();
 		Result res = new Result();
 		res.setData(newAdminService.publicReviewer(id));
 		res.setData(newAdminService.publicReviewer(id));
 		return res;
 		return res;

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

@@ -19,7 +19,7 @@ public interface NewAdminService {
 
 
 	int insert(Admin ad);
 	int insert(Admin ad);
 
 
-	int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds ,String reviewerIds);
+	int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds ,String publicReviewerIds,String assistReviewerIds);
 
 
 	int updateByPrimaryKey(Admin a);
 	int updateByPrimaryKey(Admin a);
 
 

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

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

+ 1 - 3
src/main/java/com/goafanti/common/dao/AdminPublicReviewerMapper.java

@@ -6,13 +6,11 @@ import org.springframework.data.domain.Pageable;
 
 
 import java.util.List;
 import java.util.List;
 
 
-
-
 /**
 /**
  * 管理员公出审核人表(AdminPublicReviewer)表数据库访问层
  * 管理员公出审核人表(AdminPublicReviewer)表数据库访问层
  *
  *
  * @author makejava
  * @author makejava
- * @since 2024-07-09 14:20:42
+ * @since 2024-07-09 14:28:07
  */
  */
 public interface AdminPublicReviewerMapper {
 public interface AdminPublicReviewerMapper {
 
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminPublicReviewerMapper.xml

@@ -119,7 +119,7 @@ create_time = values(create_time)
     </delete>
     </delete>
     <select id="selectByAid"  resultType="com.goafanti.admin.bo.AdminPublicReviewerBo">
     <select id="selectByAid"  resultType="com.goafanti.admin.bo.AdminPublicReviewerBo">
         select
         select
-            a.id, a.aid, a.reviewer_id as reviewerId, a.create_time as createTime,
+            a.id, a.aid, a.reviewer_id as reviewerId, a.create_time as createTime,a.type,
             b.name as reviewerName
             b.name as reviewerName
         from admin_public_reviewer a left join admin b on a.reviewer_id=b.id
         from admin_public_reviewer a left join admin b on a.reviewer_id=b.id
         where aid = #{aid}
         where aid = #{aid}

+ 15 - 3
src/main/java/com/goafanti/common/model/AdminPublicReviewer.java

@@ -10,10 +10,10 @@ import java.util.Date;
  * 管理员公出审核人表(AdminPublicReviewer)实体类
  * 管理员公出审核人表(AdminPublicReviewer)实体类
  *
  *
  * @author makejava
  * @author makejava
- * @since 2024-07-09 14:20:42
+ * @since 2024-07-09 14:28:07
  */
  */
 public class AdminPublicReviewer implements Serializable {
 public class AdminPublicReviewer implements Serializable {
-    private static final long serialVersionUID = 883328960230907242L;
+    private static final long serialVersionUID = -18188164635821727L;
 
 
     private Integer id;
     private Integer id;
 /**
 /**
@@ -21,6 +21,10 @@ public class AdminPublicReviewer implements Serializable {
      */
      */
     private String aid;
     private String aid;
 /**
 /**
+     * 0=公出审核人列表,1=协单审核人
+     */
+    private Integer type;
+/**
      * 审核人编号
      * 审核人编号
      */
      */
     private String reviewerId;
     private String reviewerId;
@@ -46,6 +50,14 @@ public class AdminPublicReviewer implements Serializable {
         this.aid = aid;
         this.aid = aid;
     }
     }
 
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public String getReviewerId() {
     public String getReviewerId() {
         return reviewerId;
         return reviewerId;
     }
     }
@@ -54,7 +66,7 @@ public class AdminPublicReviewer implements Serializable {
         this.reviewerId = reviewerId;
         this.reviewerId = reviewerId;
     }
     }
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     public Date getCreateTime() {
     public Date getCreateTime() {
         return createTime;
         return createTime;
     }
     }

+ 1 - 1
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -636,7 +636,7 @@ public class AsyncUtils {
 					updateOrderAndChangeExamine(usead, roleType);
 					updateOrderAndChangeExamine(usead, roleType);
 				}
 				}
 			}else if (roleType.equals(AFTConstants.SALESMAN)){
 			}else if (roleType.equals(AFTConstants.SALESMAN)){
-				if (!ad.getManagerId().equals(usead.getManagerId())){
+				if (ad.getManagerId()!=null&&usead.getManagerId()!=null&&!ad.getManagerId().equals(usead.getManagerId())){
 					updateOrderAndChangeExamine(ad, roleType);
 					updateOrderAndChangeExamine(ad, roleType);
 				}
 				}
 			}else {
 			}else {