|
|
@@ -121,6 +121,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
StringBuilder str =new StringBuilder();
|
|
|
//判定是单独协单还是一起协单
|
|
|
in.setAid(TokenManager.getAdminId());
|
|
|
+ in.setAname(my.getName());
|
|
|
if (in.getAssist()==1){
|
|
|
// in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
in.setMainName(my.getName());
|
|
|
@@ -172,6 +173,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
p.setId(in.getId());
|
|
|
p.setAid(aid2);
|
|
|
+ p.setAname(my2.getName());
|
|
|
p.setReleaseStart(in.getReleaseStart());
|
|
|
p.setReleaseEnd(in.getReleaseEnd());
|
|
|
p.setPlan(in.getPlan());
|
|
|
@@ -317,6 +319,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
p.setId(in.getId());
|
|
|
p.setAid(in.getAid());
|
|
|
+ p.setAname(in.getAname());
|
|
|
p.setReleaseStart(in.getReleaseStart());
|
|
|
p.setReleaseEnd(in.getReleaseEnd());
|
|
|
p.setPlan(in.getPlan());
|
|
|
@@ -742,6 +745,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
p.setId(in.getId());
|
|
|
p.setAid(aid2);
|
|
|
+ p.setAname(my2.getName());
|
|
|
p.setReleaseStart(in.getReleaseStart());
|
|
|
p.setReleaseEnd(in.getReleaseEnd());
|
|
|
p.setPlan(in.getPlan());
|
|
|
@@ -1788,8 +1792,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (!flag2) {
|
|
|
PublicRelease np = new PublicRelease();
|
|
|
BeanUtils.copyProperties(use,np);
|
|
|
+ AdminListBo my2 = adminMapper.getDeptNameByAid(s);
|
|
|
np.setAssist(2);
|
|
|
np.setAid(s);
|
|
|
+ np.setAname(my2.getName());
|
|
|
//协单审核,判定是否跳过的逻辑
|
|
|
np.setType(3);
|
|
|
np.setMainId(use.getId());
|
|
|
@@ -2814,8 +2820,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease newP= new PublicRelease();
|
|
|
if(list.isEmpty()){
|
|
|
BeanUtils.copyProperties(p,newP);
|
|
|
+ AdminListBo my2 = adminMapper.getDeptNameByAid(aid);
|
|
|
newP.setId(null);
|
|
|
newP.setAid(aid);
|
|
|
+ newP.setUserNames(my2.getName());
|
|
|
newP.setAssist(3);
|
|
|
newP.setType(4);
|
|
|
publicReleaseMapper.insertSelective(newP);
|