|
|
@@ -1280,9 +1280,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseLogMapper.insertSelective(log2);
|
|
|
PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log3);
|
|
|
- updatePR.setStatus(2);
|
|
|
- }else {
|
|
|
- updatePR.setStatus(1);
|
|
|
}
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
@@ -1306,8 +1303,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setType(3);
|
|
|
np.setMainId(use.getId());
|
|
|
np.setId(null);
|
|
|
- publicReleaseMapper.insertSelective(np);
|
|
|
int x=pushAssist(s, np,use);
|
|
|
+ publicReleaseMapper.insertSelective(np);
|
|
|
//补充客户表
|
|
|
addpublicReleaseDtails(use,np);
|
|
|
if (x==2||x==3){
|
|
|
@@ -1321,9 +1318,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseLogMapper.insertSelective(log2);
|
|
|
PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log3);
|
|
|
- updatePR.setStatus(2);
|
|
|
- }else {
|
|
|
- updatePR.setStatus(1);
|
|
|
}
|
|
|
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);
|