Przeglądaj źródła

协单审核接口开发

anderx 1 rok temu
rodzic
commit
f123ba7189

+ 22 - 9
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1056,11 +1056,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setType(null);
 				np.setAssist(2);
 				//协单审核,判定是否跳过的逻辑
-				pushAssist(out.getAid(), np,use);
+				int x=pushAssist(out.getAid(), np,use);
 				np.setAid(null);
 				publicReleaseMapper.updateByPrimaryKeySelective(np);
 				updatePublicReleaseDtails(use,np);
-
+				if (x==2){
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log2);
+				}else if (x==3){
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单审核人重复,自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log2);
+				}
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
 				publicReleaseLogMapper.insertSelective(log);
@@ -1081,13 +1087,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setAssist(2);
 				np.setAid(s);
 				//协单审核,判定是否跳过的逻辑
-				pushAssist(s, np,use);
+				int x=pushAssist(s, np,use);
 				np.setType(3);
 				np.setMainId(use.getId());
 				np.setId(null);
 				publicReleaseMapper.insertSelective(np);
 				//补充客户表
 				addpublicReleaseDtails(use,np);
+				if (x==2){
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log2);
+				}else if (x==3){
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单审核人重复,自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log2);
+				}
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
 				sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
@@ -1105,8 +1118,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param np 新协单公出信息
 	 * @param use 原公出信息
 	 */
-	private void pushAssist(String s, PublicRelease np, PublicRelease use) {
+	private int pushAssist(String s, PublicRelease np, PublicRelease use) {
 		List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(s);
+		int res=0;
 		//协单人
 		Admin admin = adminMapper.selectByPrimaryKey(s);
 		List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
@@ -1129,18 +1143,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			if (flag){
 				np.setStatus(2);
-				PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单审核人重复,自动通过", new Date());
-				publicReleaseLogMapper.insertSelective(log2);
+				res=3;
 			}else {
 				np.setStatus(1);
+				res=1;
 			}
 		}else {
 			np.setStatus(2);
-			PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
-			publicReleaseLogMapper.insertSelective(log2);
+			res=2;
 		}
 
-
+		return res;
 	}
 
 	private void updatePublicReleaseDtails(PublicRelease use, PublicRelease in) {