|
|
@@ -322,7 +322,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
|
|
|
uses=pushPublicReleaseDetails(split,prList,use,in);
|
|
|
}
|
|
|
-
|
|
|
String userNames=publicReleaseDetailsMapper.getNamesByPrid(in.getId());
|
|
|
PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
|
|
|
in.setUserNames(userNames);
|
|
|
@@ -359,6 +358,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -366,7 +366,33 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//先删除,再修改个,再新增,有利于减少计算
|
|
|
deletePRD(split,prList);
|
|
|
publicReleaseDetailsMapper.updateDistrictByPrid(in);
|
|
|
- return addPRD(split,prList,use);
|
|
|
+ List<User> users = addPRD(split, prList, use);
|
|
|
+ //如果是主公出的话
|
|
|
+ if (use.getAssist()==1){
|
|
|
+ pushAssist(use.getId(),split,in);
|
|
|
+ }
|
|
|
+
|
|
|
+ return users;
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushAssist(Integer id,List<String> split,InputPublicRelease in) {
|
|
|
+ List<PublicRelease> assist3 = publicReleaseMapper.selectByMainId(id, 3, null);
|
|
|
+ pushUpdate(assist3,split,in);
|
|
|
+ List<PublicRelease> assist4 = publicReleaseMapper.selectByMainId(id, 4, null);
|
|
|
+ pushUpdate(assist4,split,in);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushUpdate(List<PublicRelease> assist,List<String> split,InputPublicRelease in) {
|
|
|
+ if (!assist.isEmpty()){
|
|
|
+ for (PublicRelease p : assist) {
|
|
|
+ in.setId(p.getId());
|
|
|
+ publicReleaseMapper.updateByPrimaryKey(in);
|
|
|
+ List<OutPublicReleaseDetails> out = publicReleaseDetailsMapper.selectByPCid(p.getId());
|
|
|
+ deletePRD(split,out);
|
|
|
+ addPRD(split,out,p);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private void deletePRD(List<String> split, List<OutPublicReleaseDetails> prdList) {
|
|
|
@@ -433,9 +459,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ for (User u : users) {
|
|
|
+ str=str.append(use.getUserNames()).append(",");
|
|
|
+ }
|
|
|
if (publicType!=use.getPublicType()){
|
|
|
PublicRelease newP=new PublicRelease();
|
|
|
newP.setId(use.getId());
|
|
|
+ if (str.length()>1)newP.setUserNames(str.substring(0,str.length()-1));
|
|
|
newP.setPublicType(publicType);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(newP);
|
|
|
}
|