|
@@ -398,7 +398,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setStatus(3);
|
|
in.setStatus(3);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
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(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), str.toString(), date);
|
|
|
|
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.cx.getCode(), str.toString(), date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
|
|
|
}else {
|
|
}else {
|
|
@@ -413,7 +413,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setStatus(status);
|
|
np.setStatus(status);
|
|
|
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.ty.getCode(),str.toString(), date);
|
|
|
|
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(out.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());
|
|
|
}
|
|
}
|
|
@@ -436,7 +436,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setId(null);
|
|
np.setId(null);
|
|
|
publicReleaseMapper.insertSelective(np);
|
|
publicReleaseMapper.insertSelective(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(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), str.toString(), date);
|
|
|
|
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
|
|
|
sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}
|
|
}
|