|
@@ -134,30 +134,45 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(my.getId(),1, "["+my.getName()+"]发起["+userNames+"]的发起[仅技术协单公出]邀请。");
|
|
sendNoticeAndSoucket(my.getId(),1, "["+my.getName()+"]发起["+userNames+"]的发起[仅技术协单公出]邀请。");
|
|
|
//
|
|
//
|
|
|
adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
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<>();
|
|
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);
|
|
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;
|
|
return map;
|
|
|
}else {
|
|
}else {
|