|
|
@@ -764,11 +764,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(p.getAid());
|
|
|
+
|
|
|
User u=userMapper.selectByPrimaryKey(p.getUid());
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
- str=str.append("[").append(a.getName()).append("]").append("公出").append("[").append(u.getUsername()).append("]").append("邀请你协助!");
|
|
|
- addpublicLog(newP.getId(),PublicReleaseLog.states.fq.getCode(),str.toString());
|
|
|
+ str=str.append("公出").append("[").append(u.getUsername()).append("]").append("邀请你协助!");
|
|
|
addWeChatNotice( aid,1,str.toString(),newP.getId());
|
|
|
}
|
|
|
|
|
|
@@ -794,6 +793,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
String openid=recipient.getOpenId();
|
|
|
str=new StringBuffer("[").append(my.getName()).append("]").append(str).toString();
|
|
|
+ addpublicLog(prid,type,str);
|
|
|
sendNoticeAndSoucket(recipient.getId(),type,str);
|
|
|
if (type==0||type==2){
|
|
|
if (openid!=null) {
|
|
|
@@ -869,12 +869,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private void deleteAssistantPulicRelease(PublicRelease p, String aid) {
|
|
|
publicReleaseMapper.updateStatusByMainId(3,4,p.getMainId(),aid);
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(p.getAid());
|
|
|
User u=userMapper.selectByPrimaryKey(p.getUid());
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
- str=str.append("[").append(a.getName()).append("]").append("公出").append("[").append(u.getUsername()).append("]").append("撤销了你的协助!");
|
|
|
+ str=str.append("公出").append("[").append(u.getUsername()).append("]").append("撤销了你的协助!");
|
|
|
for (PublicRelease pr : list) {
|
|
|
- addpublicLog(pr.getId(),PublicReleaseLog.states.cx.getCode(),str.toString());
|
|
|
addWeChatNotice( pr.getAid(),3,str.toString(),p.getId());
|
|
|
}
|
|
|
}
|