|
|
@@ -134,14 +134,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(in.getAid(),1, "["+my.getName()+"]发起["+userNames+"]的发起[仅技术协单公出]邀请。");
|
|
|
//处理通知技术协单审核人
|
|
|
adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
+ //如果没有直接改变状态
|
|
|
if (adminPublicReviewerBos.size()==0){
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.ty.getCode(), "未设置技术协单审核人,跳过审核");
|
|
|
+// sendNoticeAndSoucket(my.getId(), 2, "你发起的["+userNames+"]仅技术协单公出申请,已通过。");
|
|
|
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(","));
|
|
|
+ }else {
|
|
|
for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
|
|
|
if (aidList.contains(adminPublicReviewerBo.getAid())==false){
|
|
|
sendListBo bo =new sendListBo(adminPublicReviewerBo.getAid(),
|
|
|
@@ -149,7 +151,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
if (!aidList.isEmpty()){
|