|
@@ -396,16 +396,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
|
|
|
}else {
|
|
}else {
|
|
|
PublicRelease np = new PublicRelease();
|
|
PublicRelease np = new PublicRelease();
|
|
|
- BeanUtils.copyProperties(out,np);
|
|
|
|
|
|
|
+ BeanUtils.copyProperties(use,np);
|
|
|
|
|
+ np.setId(out.getId());
|
|
|
np.setMainId(null);
|
|
np.setMainId(null);
|
|
|
np.setClockIn(null);
|
|
np.setClockIn(null);
|
|
|
np.setClockInTime(null);
|
|
np.setClockInTime(null);
|
|
|
np.setType(null);
|
|
np.setType(null);
|
|
|
np.setAssist(2);
|
|
np.setAssist(2);
|
|
|
np.setStatus(status);
|
|
np.setStatus(status);
|
|
|
|
|
+ np.setAid(null);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(u.getUsername()).append("]。");
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(u.getUsername()).append("]。");
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
|
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
sendNoticeAndSoucket(out.getAid(),np.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(out.getAid(),np.getStatus(),str.toString());
|
|
|
}
|
|
}
|