|
|
@@ -1260,13 +1260,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setAid(null);
|
|
|
publicReleaseMapper.update(np);
|
|
|
updatePublicReleaseDtails(use,np);
|
|
|
- if (x==2){
|
|
|
- PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log2);
|
|
|
- }else if (x==3){
|
|
|
- PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单审核人重复,自动通过", new Date());
|
|
|
+ if (x==2||x==3){
|
|
|
+ String remarks="";
|
|
|
+ if (x==2){
|
|
|
+ remarks="协单未设置审核人,自动通过";
|
|
|
+ }else if (x==3){
|
|
|
+ remarks="协单审核人重复,自动通过";
|
|
|
+ }
|
|
|
+ PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log2);
|
|
|
+ PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
+ publicReleaseLogMapper.insertSelective(log3);
|
|
|
}
|
|
|
+
|
|
|
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);
|