|
|
@@ -1280,8 +1280,10 @@ 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);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
@@ -1319,6 +1321,9 @@ 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);
|
|
|
@@ -1386,7 +1391,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setStatus(2);
|
|
|
res=2;
|
|
|
}
|
|
|
-
|
|
|
+ //res 1=未完成全部审核,2=未设置跳过审核,3=已审核全部跳过
|
|
|
return res;
|
|
|
}
|
|
|
|