|
|
@@ -604,34 +604,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*/
|
|
|
private void updatepushAssistant(PublicRelease use,Admin a) {
|
|
|
List<String> list=new ArrayList();
|
|
|
- list =new ArrayList<>(Arrays.asList(use.getAssistantAid().split(",")));
|
|
|
- List<PublicRelease> deletelist = publicReleaseMapper.selectByMainId(use.getId(),4,null);
|
|
|
- for (PublicRelease p : deletelist) {
|
|
|
- boolean flag=false;
|
|
|
- for (String s : list) {
|
|
|
- if (p.getAid().equals(s)){
|
|
|
- flag=true;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- if (flag){
|
|
|
-// if (!use.getUid().equals(p.getUid()))p.setUid(use.getUid());
|
|
|
-// if (!use.getDistrictName().equals(p.getDistrictName())){
|
|
|
-// p.setDistrictName(use.getDistrictName());
|
|
|
-// p.setLatitude(use.getLatitude());
|
|
|
-// p.setLongitude(use.getLongitude());
|
|
|
-// }
|
|
|
+ List<PublicRelease> uselist = publicReleaseMapper.selectByMainId(use.getId(),4,null);
|
|
|
+ for (PublicRelease p : uselist) {
|
|
|
if(!use.getReleaseStart().equals(p.getReleaseStart()))p.setReleaseStart(use.getReleaseStart());
|
|
|
if (!use.getReleaseEnd().equals(p.getReleaseEnd()))p.setReleaseEnd(use.getReleaseEnd());
|
|
|
p.setStatus(2);
|
|
|
p.setAssistantAid(use.getAssistantAid());
|
|
|
p.setAssistantName(use.getAssistantName());
|
|
|
+ p.setUserNames(use.getUserNames());
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(p.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), str.toString(), new Date());
|
|
|
sendNoticeAndSoucket(p.getAid(),p.getStatus(),str.toString());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
- }
|
|
|
|
|
|
}
|
|
|
}
|