Bladeren bron

发起单独协单修改

anderx 1 jaar geleden
bovenliggende
commit
dc7f01c71a

+ 3 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -564,16 +564,16 @@ assist_process = values(assist_process)
         <if test="type==0">
             and a.public_type in (0,1,2,3)
             <if test="assist ==0">
-                and a.assist in(0,1)
+                and a.assist in(0,1,4)
             </if>
             <if test="assist == 2">
-                and a.assist    =2
+                and a.assist    in (2,4)
             </if>
             <if test="assist == 3">
                 and a.assist    =3
             </if>
             <if test="assist ==4">
-                and a.assist in (2,3)
+                and a.assist in (2,3,4)
             </if>
             <if test="assistType ==1">
                 and a.assist in(0,1,2)

+ 32 - 17
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -134,30 +134,45 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				sendNoticeAndSoucket(my.getId(),1, "["+my.getName()+"]发起["+userNames+"]的发起[仅技术协单公出]邀请。");
 				//
 				adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
-				for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
-					if (aidList.contains(adminPublicReviewerBo.getAid())==false){
-						sendListBo bo =new sendListBo(adminPublicReviewerBo.getAid(),
-								s,in.getId(),userNames);
+				if (adminPublicReviewerBos.size()==0){
+					addpublicLog(in.getId(), PublicReleaseLog.states.ty.getCode(), "未设置技术协单审核人,跳过审核");
+					PublicRelease updateStatus=new PublicRelease();
+					updateStatus.setId(in.getId());
+					updateStatus.setAssistProcess(4);
+					updateStatus.setStatus(2);
+					publicReleaseMapper.update(updateStatus);
+					String aid = adminPublicReviewerBos.stream().map(e -> e.getAid()).collect(Collectors.joining(","));
+					for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
+						if (aidList.contains(adminPublicReviewerBo.getAid())==false){
+							sendListBo bo =new sendListBo(adminPublicReviewerBo.getAid(),
+									s,in.getId(),userNames);
+						}
 					}
 				}
+
 			}
 			Map<String, Object> map = new HashMap<>();
-			for (sendListBo e : aidList) {
-
-				Admin a = adminMapper.selectByPrimaryKey(e.getAid());
-				sendNoticeAndSoucket(e.getAid(),1, "["+my.getName()+"]发起["+e.getUserNames()+"]仅技术协单公出申请,请及时审核。");
-				if (a.getOpenId() !=null) {
-					Integer res= weChatUtils.addNotice(a.getOpenId(), in.getStatus(), e.getPrid(), date, my.getName(),"["+ my.getName()+"]发起仅协单申请");
-					if (res!=0) {
+			if (!aidList.isEmpty()){
+				List<Integer> listMap=new ArrayList<>();
+				for (sendListBo e : aidList) {
+					Admin a = adminMapper.selectByPrimaryKey(e.getAid());
+					sendNoticeAndSoucket(e.getAid(),1, "["+my.getName()+"]发起["+e.getUserNames()+"]仅技术协单公出申请,请及时审核。");
+					if (a.getOpenId() !=null) {
+						Integer res= weChatUtils.addNotice(a.getOpenId(), in.getStatus(), e.getPrid(), date, my.getName(),"["+ my.getName()+"]发起仅协单申请");
+						if (res!=0) {
+							sendEmail(my, a,1);
+						}
+						//返回微信错误码
+						listMap.add(res);
+					}else {
+						//返回没有绑定微信
 						sendEmail(my, a,1);
+						listMap.add(2);
 					}
-					//返回微信错误码
-					map.put("code", res);
-				}else {
-					//返回没有绑定微信
-					sendEmail(my, a,1);
-					map.put("code", 2);
 				}
+				map.put("code", listMap);
+			}else {
+				map.put("code", 0);
 			}
 			return map;
 		}else {