|
|
@@ -959,6 +959,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setAid(null);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
updatePublicReleaseDtails(use,np.getId());
|
|
|
+
|
|
|
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);
|
|
|
@@ -993,8 +994,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
private void updatePublicReleaseDtails(PublicRelease use, Integer id) {
|
|
|
+
|
|
|
List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPrid(use.getId());
|
|
|
List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
+ //打卡信息重新梳理
|
|
|
+
|
|
|
//查找新增的
|
|
|
for (OutPublicReleaseDetails out : list) {
|
|
|
boolean flag=true;
|
|
|
@@ -1026,7 +1030,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseDetailsMapper.deleteByPrimaryKey(out2.getId());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ //最后再来处理打卡信息
|
|
|
+ addPublicReleaseDateClock(use);
|
|
|
}
|
|
|
|
|
|
private void addpublicReleaseDtails(PublicRelease use, Integer id) {
|