|
|
@@ -119,11 +119,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicReleaseDetails> prdList=new ArrayList<>();
|
|
|
List<User> users=new ArrayList<>();
|
|
|
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);
|
|
|
}
|
|
|
@@ -705,6 +704,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
private void pushUpdatePublic(InputPublicRelease in, List<User> uses, PublicRelease use, PublicReleaseLog log, String userNames, Date date, Map checkOrderNo) {
|
|
|
if (in.getUids()!=null){
|
|
|
+ //如果是多企业公出,修改多企业信息
|
|
|
List<String> split = Arrays.asList(in.getUids().split(","));
|
|
|
List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPrid(in.getId());
|
|
|
uses =pushPublicReleaseDetails(split,prList, use, in);
|
|
|
@@ -756,7 +756,6 @@ 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());
|