|
|
@@ -856,7 +856,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType) {
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
Date date =new Date();
|
|
|
- boolean flag=false;
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
p.setId(id);
|
|
|
PublicRelease use=publicReleaseMapper.queryById(id);
|
|
|
@@ -910,14 +909,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAuditInfo(str.toString());
|
|
|
p.setAuditTime(date);
|
|
|
p.setRejectName(ad.getName());
|
|
|
- flag=true;
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
//营销员审核
|
|
|
}else if (examineType==1){
|
|
|
//通知公出人切换成公出人审核人
|
|
|
- List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
|
|
|
- adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
|
|
|
if (status==2){
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
|
|
|
+ adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
//审核通过
|
|
|
str=str.append("同意公出我的企业,").append(remarks);
|
|
|
content=content.append("已通过审核,请尽快审核。");
|
|
|
@@ -956,7 +955,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAuditInfo(str.toString());
|
|
|
p.setRejectName(ad.getName());
|
|
|
addpublicLog(id, 0, str.toString());
|
|
|
- flag=true;
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
}
|
|
|
}else if (examineType==2){
|
|
|
//通知公出人切换成公出人审核人
|
|
|
@@ -972,7 +971,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicExamine newp=new PublicExamine();
|
|
|
newp.setId(pe.getId());
|
|
|
newp.setStatus(1);
|
|
|
- publicExamineMapper.updateByPrimaryKey(newp);
|
|
|
+ publicExamineMapper.updateByPrimaryKeySelective(newp);
|
|
|
x++;
|
|
|
}else {
|
|
|
if (pe.getStatus()==1){
|
|
|
@@ -982,10 +981,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (x==publicExamines.size()){
|
|
|
p.setTechStartProcess(2);
|
|
|
- flag=true;
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
|
|
|
+ adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
|
|
|
+ sendNoticeAndSoucket(adminPublicReviewerBo.getReviewerId(),status,content.toString());
|
|
|
+ }
|
|
|
}
|
|
|
addpublicLog(id, status, str.toString());
|
|
|
-
|
|
|
}else if (status==0){
|
|
|
//审核驳回
|
|
|
//切换通知人公出负责人
|
|
|
@@ -997,13 +999,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAuditInfo(str.toString());
|
|
|
p.setRejectName(ad.getName());
|
|
|
addpublicLog(id, 0, str.toString());
|
|
|
- flag=true;
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
}
|
|
|
}
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- if (flag){
|
|
|
- sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
- }
|
|
|
if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
|
|
|
publicReleaseMapper.update(p);
|
|
|
updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());
|