|
|
@@ -188,6 +188,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setMainStatus(1);
|
|
|
}
|
|
|
PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
|
|
|
+
|
|
|
if(in.getStatus()==null||in.getStatus()!=3) {
|
|
|
in.setStatus(1);
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
@@ -197,16 +198,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
//重新发起
|
|
|
addPublicReleaseLog(my,in,u.getNickname(),date);
|
|
|
-
|
|
|
}else {
|
|
|
- log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
|
|
|
+ List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
|
|
|
+ log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
for (PublicRelease out : list) {
|
|
|
addpublicLog(out.getId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单");
|
|
|
out.setStatus(3);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
}
|
|
|
- List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
|
|
|
+
|
|
|
for (PublicRelease out : list2) {
|
|
|
addpublicLog(out.getId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单助手");
|
|
|
out.setStatus(3);
|
|
|
@@ -395,8 +396,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
|
|
|
}else {
|
|
|
PublicRelease np = new PublicRelease();
|
|
|
- np.setId(out.getId());
|
|
|
- np.setAid(out.getAid());
|
|
|
+ BeanUtils.copyProperties(out,np);
|
|
|
np.setMainId(null);
|
|
|
np.setClockIn(null);
|
|
|
np.setClockInTime(null);
|
|
|
@@ -453,6 +453,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
if (flag){
|
|
|
+ if (use.getUid().equals(p.getUid()))p.setUid(use.getUid());
|
|
|
+ if (use.getUserName().equals(p.getUserName())){
|
|
|
+ p.setUserName(use.getUserName());
|
|
|
+ p.setLatitude(use.getLatitude());
|
|
|
+ p.setLongitude(use.getLongitude());
|
|
|
+ }
|
|
|
p.setStatus(2);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(u.getUsername()).append("]。");
|