|
|
@@ -121,11 +121,11 @@ 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());
|
|
|
in.setAssistProcess(1);
|
|
|
-
|
|
|
}
|
|
|
if (in.getType() == 1) {
|
|
|
//技术公出
|
|
|
@@ -172,6 +172,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 +318,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());
|
|
|
@@ -452,7 +454,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String format = getString(my, data,tOrderNew);
|
|
|
pushNoticeAndSoucketAndEmail(my, in, date, a, format, map);
|
|
|
}
|
|
|
- map.put("data", publicReleaseMapper.selectDtails(in.getId()));
|
|
|
+ OutPublicRelease outPublicRelease = publicReleaseMapper.selectDtails(in.getId());
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(outPublicRelease.getAid());
|
|
|
+ StringBuffer sb=new StringBuffer();
|
|
|
+ adminPublicReviewerBos.forEach(e->{
|
|
|
+ if (e.getType()==0)sb.append(e.getReviewerName()).append(",");
|
|
|
+ });
|
|
|
+ if(sb.length()>0)outPublicRelease.setReviewerName(sb.toString());
|
|
|
+ map.put("data", outPublicRelease);
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -742,6 +751,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 +1798,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());
|
|
|
@@ -2718,6 +2730,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (id==null)id=myPublic.get(0).getId();
|
|
|
OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ adminPublicReviewerBos.forEach(e -> {
|
|
|
+ if (e.getType()==0){
|
|
|
+ sb.append(e.getReviewerName()).append(",");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ if (sb.length()>0) {
|
|
|
+ out.setReviewerName(sb.substring(0,sb.length()-1));
|
|
|
+ }
|
|
|
List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
|
|
|
pushDateClockDetails(prdList,prdcList);
|
|
|
@@ -2814,8 +2836,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);
|