|
|
@@ -1958,7 +1958,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*/
|
|
|
private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
|
|
|
//协单
|
|
|
- List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
+ int type=3;
|
|
|
+ if (use.getType()==5)type=6;
|
|
|
+ List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),type,null);
|
|
|
String []ss= use.getAssistAid().split(",");
|
|
|
//数据库与传入比对,如果不存在就标记撤销 ,如果存在就修改成
|
|
|
for (PublicRelease out : list) {
|
|
|
@@ -1986,9 +1988,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setId(out.getId());
|
|
|
np.setMainId(null);
|
|
|
np.setType(null);
|
|
|
- //如果是修改,不会切换人物所以删除
|
|
|
- np.setAid(null);
|
|
|
- np.setAname(null);
|
|
|
np.setAssist(2);
|
|
|
pushAssist(use, date, a, out, np);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
@@ -2021,6 +2020,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (PublicRelease o : list) {
|
|
|
if (s.equals(o.getAid())) {
|
|
|
flag2 = true;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
if (!flag2) {
|
|
|
@@ -2084,6 +2084,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseMapper.insertSelective(np);
|
|
|
}else {
|
|
|
np.setAid(null);
|
|
|
+ np.setAname(null);
|
|
|
publicReleaseMapper.update(np);
|
|
|
}
|
|
|
updatePublicReleaseDtails(use, np);
|