|
|
@@ -984,7 +984,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setId(null);
|
|
|
publicReleaseMapper.insertSelective(np);
|
|
|
//补充客户表
|
|
|
- addpublicReleaseDtails(use,np.getId());
|
|
|
+ addpublicReleaseDtails(use,np);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
|
|
|
sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
|
|
|
@@ -1034,18 +1034,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addPublicReleaseDateClock(use);
|
|
|
}
|
|
|
|
|
|
- private void addpublicReleaseDtails(PublicRelease use, Integer id) {
|
|
|
+ private void addpublicReleaseDtails(PublicRelease use, PublicRelease in) {
|
|
|
List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPrid(use.getId());
|
|
|
for (OutPublicReleaseDetails out : list) {
|
|
|
OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
|
|
|
BeanUtils.copyProperties(out,prd);
|
|
|
- prd.setPrid(id);
|
|
|
+ prd.setPrid(in.getId());
|
|
|
prd.setClockIn(0);
|
|
|
prd.setClockInTime(null);
|
|
|
prd.setMainStatus(0);
|
|
|
publicReleaseDetailsMapper.insertSelective(prd);
|
|
|
}
|
|
|
- addPublicReleaseDateClock(use);
|
|
|
+ addPublicReleaseDateClock(in);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1518,7 +1518,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newP.setAssist(3);
|
|
|
newP.setType(4);
|
|
|
publicReleaseMapper.insertSelective(newP);
|
|
|
- addpublicReleaseDtails(p,newP.getId());
|
|
|
+ addpublicReleaseDtails(p,newP);
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("邀请你协助!");
|
|
|
addWeChatNotice( aid,1,str.toString(),newP.getId());
|