|
|
@@ -1434,8 +1434,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
StringBuffer content=null;
|
|
|
String noticeAid=null;
|
|
|
for (PublicReleaseTransferUserBo e : list) {
|
|
|
- PublicExamine pe=new PublicExamine();
|
|
|
- pe.setPrid(e.getId());
|
|
|
+ List<PublicExamine> pes=new ArrayList<>();
|
|
|
if (e.getAid().equals(aid)){
|
|
|
content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司的外出申请已发起,请尽快审核。");
|
|
|
//再查比对和发起者一致的全部走入下一个审核流程
|
|
|
@@ -1448,17 +1447,23 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
Admin sendAdmin=adminMapper.selectById(admin.getReviewer());
|
|
|
// noticeAid=sendAdmin.getId();
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos0 = adminPublicReviewerBos.stream().filter(e1 -> e1.getType().equals(0)).collect(Collectors.toList());
|
|
|
+ //又
|
|
|
if (adminPublicReviewerBos0.size()>0){
|
|
|
for (AdminPublicReviewerBo e2 : adminPublicReviewerBos0) {
|
|
|
logStatus=2;
|
|
|
logMsg="转交客户到发起公出审核人,自动审核通过。";
|
|
|
+ PublicExamine pe=new PublicExamine();
|
|
|
+ pe.setPrid(e.getId());
|
|
|
pe.setAid(e2.getReviewerId());
|
|
|
pe.setAname(e2.getReviewerName());
|
|
|
pe.setCreateTime(new Date());
|
|
|
+ pes.add(pe);
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
//与发起者不一致的就需要修改审核人员
|
|
|
+ PublicExamine pe=new PublicExamine();
|
|
|
+ pe.setPrid(e.getId());
|
|
|
pe.setAid(aid);
|
|
|
pe.setAname(admin.getName());
|
|
|
//给新的审核人发送消息
|
|
|
@@ -1466,6 +1471,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
logMsg="转交客户归属人到["+admin.getName()+"]。";
|
|
|
content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司已转交给您,相关公出请尽快审核。");
|
|
|
noticeAid=aid;
|
|
|
+ pes.add(pe);
|
|
|
}
|
|
|
PublicReleaseLog log = new PublicReleaseLog(e.getId(), TokenManager.getAdminId(), logStatus, logMsg, new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
@@ -1477,7 +1483,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
n.setContent(content.toString());
|
|
|
n.setReaded(0);//未读
|
|
|
asyncUtils.addNotice(n);
|
|
|
- publicExamineMapper.updateByPridSelective(pe);
|
|
|
+ if (pes.size()>0){
|
|
|
+ for (PublicExamine pe : pes) {
|
|
|
+ publicExamineMapper.updateByPridSelective(pe);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|