ソースを参照

协单审核接口开发

anderx 1 年間 前
コミット
d017f44f07

+ 4 - 4
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -1,11 +1,10 @@
 package com.goafanti.common.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.goafanti.common.model.PublicReleaseLog;
 import com.goafanti.weChat.bo.outPublicReleaseLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface PublicReleaseLogMapper {
 
@@ -54,4 +53,5 @@ public interface PublicReleaseLogMapper {
 	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id,@Param ("ufid")String ufid);
 
 
+
 }

+ 15 - 6
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1055,8 +1055,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setMainId(null);
 				np.setType(null);
 				np.setAssist(2);
-				//以前是直接公出通过,现在是通过了,就出现一条需要协单审核的
-				np.setStatus(1);
+				//协单审核,判定是否跳过逻辑
+				pushAssist(out.getAid(), np,use);
 				np.setAid(null);
 				publicReleaseMapper.updateByPrimaryKeySelective(np);
 				updatePublicReleaseDtails(use,np);
@@ -1107,16 +1107,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 */
 	private void pushAssist(String s, PublicRelease np, PublicRelease use) {
 		List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(s);
+		//协单人
+		Admin admin = adminMapper.selectByPrimaryKey(s);
 		List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
 		if (!collect.isEmpty()){
-			Admin admin = adminMapper.selectByPrimaryKey(use.getAid());
+			//公出发起人
+			List<outPublicReleaseLog> outPublicReleaseLogs = publicReleaseLogMapper.listPublicReleaseLog(use.getId(), null);
+			List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());
 			boolean flag = false;
 			for (AdminPublicReviewerBo e : collect) {
-				if (e.getAid().equals(admin.getReviewer())){
-					flag=true;
-
+				for (outPublicReleaseLog log : collect1) {
+					if (log.getAid().equals(e.getAid())){
+						flag=true;
+						break;
+					}
+				}
+				if(flag){
 					break;
 				}
+
 			}
 			if (flag){
 				np.setStatus(2);