diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java index e838fcd2..05bee0a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -63,6 +63,12 @@ public class WgWorkGroupController extends BaseController { return wgWorkGroupService.updateData(wgWorkGroupShowDTO); } + @ApiOperation("修改工作组节点数据") + @PostMapping("/updateDataByWk") + public ResponseMessage updateDataByWk(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateDataByWk(wgWorkGroupShowDTO); + } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java index 12341a91..f15f4d5a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java @@ -26,4 +26,6 @@ public interface WgWorkGroupDao extends BaseMapper { List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + List researchDatasCheck(@Param(value = "data") String data,@Param(value = "status")String status); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java index 29b3096b..e6f56e74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -31,6 +31,8 @@ public interface IWgWorkGroupService extends IService { ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 2525d233..e30304b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -126,33 +126,33 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgStandorpolicyInfos= wgStandorpolicyInfoDao.researchDatas(); - Map map=new HashMap<>(); + List wgStandorpolicyInfos = wgStandorpolicyInfoDao.researchDatas(); + Map map = new HashMap<>(); wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - map.put(wgStandorpolicyInfo.getStandId()+"-"+wgStandorpolicyInfo.getWgId(),wgStandorpolicyInfo); + map.put(wgStandorpolicyInfo.getStandId() + "-" + wgStandorpolicyInfo.getWgId(), wgStandorpolicyInfo); }); - if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size()>0){ - List wgWorkGroups=new ArrayList<>(); + if (null != wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size() > 0) { + List wgWorkGroups = new ArrayList<>(); wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - WgWorkGroup wgWorkGroup=new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO, wgWorkGroup); wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); wgStandorpolicyInfo.setWgId(wgWorkGroup.getId()); - if (null==map.get(wgStandorpolicyInfo.getStandId()+"-"+wgWorkGroup.getPid())) { + if (null == map.get(wgStandorpolicyInfo.getStandId() + "-" + wgWorkGroup.getPid())) { wgWorkGroups.add(wgWorkGroup); } }); - if (wgWorkGroups.size()==0){ + if (wgWorkGroups.size() == 0) { return "政策已存在,请勿重复添加"; } - boolean flag=wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); - boolean flag1=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); - if (flag && flag1){ + boolean flag = wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); + boolean flag1 = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + if (flag && flag1) { return "添加成功"; - }else { + } else { return "添加失败"; } - }else { + } else { return "数据有误,请检查数据"; } } @@ -179,82 +179,82 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgMeetingUserRelations = wgMeetingUserRelationService.getMeetingAllPeoples(type); //处理数据 //part1 会议数据组装 提速第一步建造数据的map集合 - Map wgWorkGroupMap=new HashMap<>(); + Map wgWorkGroupMap = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(),wgWorkGroupShowDTO); + wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(), wgWorkGroupShowDTO); }); Map meetMap = new HashMap<>(); - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { meetMap.put(wgMeetingInfo.getId(), wgMeetingInfo); }); } //组装会议数据 - if (null!=wgMeetingUserRelations && wgMeetingUserRelations.size()>0) { + if (null != wgMeetingUserRelations && wgMeetingUserRelations.size() > 0) { wgMeetingUserRelations.forEach(wgMeetingUserRelationShow -> { - if (null!=meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { + if (null != meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo().add(wgMeetingUserRelationShow); - }else { - List wgMeetingUserRelationShows=new ArrayList<>(); + } else { + List wgMeetingUserRelationShows = new ArrayList<>(); wgMeetingUserRelationShows.add(wgMeetingUserRelationShow); meetMap.get(wgMeetingUserRelationShow.getMeetingId()).setJoinMeetingPeopleInfo(wgMeetingUserRelationShows); } }); } //组装总数据 - if (null!=wgDeptShows && wgDeptShows.size()>0) { + if (null != wgDeptShows && wgDeptShows.size() > 0) { wgDeptShows.forEach(wgDeptShow -> { - if (null!=wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { + if (null != wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts().add(wgDeptShow); - }else { + } else { List wgDepts = new ArrayList<>(); wgDepts.add(wgDeptShow); wgWorkGroupMap.get(wgDeptShow.getWgId()).setWgDepts(wgDepts); } }); } - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { - if (null!=wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { + if (null != wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos().add(meetMap.get(wgMeetingInfo.getId())); - }else { + } else { List wgMeetingInfos1 = new ArrayList<>(); wgMeetingInfos1.add(wgMeetingInfo); wgWorkGroupMap.get(wgMeetingInfo.getWgId()).setWgMeetingInfos(wgMeetingInfos1); } }); } - if (null!=wgNetInfoDTOS && wgNetInfoDTOS.size()>0) { + if (null != wgNetInfoDTOS && wgNetInfoDTOS.size() > 0) { wgNetInfoDTOS.forEach(wgNetInfoDTO -> { - if (null!=wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { + if (null != wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos().add(wgNetInfoDTO); - }else { - List wgNetInfos=new ArrayList<>(); + } else { + List wgNetInfos = new ArrayList<>(); wgNetInfos.add(wgNetInfoDTO); wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).setWgNetInfos(wgNetInfos); } }); } - if (null!=wgPayInfos && wgPayInfos.size()>0) { + if (null != wgPayInfos && wgPayInfos.size() > 0) { wgPayInfos.forEach(wgPayInfo -> { - if (null!=wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { + if (null != wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos().add(wgPayInfo); - }else { - List wgPayInfos1=new ArrayList<>(); + } else { + List wgPayInfos1 = new ArrayList<>(); wgPayInfos1.add(wgPayInfo); wgWorkGroupMap.get(wgPayInfo.getWgId()).setWgPayInfos(wgPayInfos1); } }); } //处理标准政策数据 - if (null!=wgStandorpolicyInfos && wgStandorpolicyInfos.size()>0) { + if (null != wgStandorpolicyInfos && wgStandorpolicyInfos.size() > 0) { wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - if (null!=wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { + if (null != wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos().add(wgStandorpolicyInfo); - }else { - List wgStandorpolicyInfos1=new ArrayList<>(); + } else { + List wgStandorpolicyInfos1 = new ArrayList<>(); wgStandorpolicyInfos1.add(wgStandorpolicyInfo); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setWgStandorpolicyInfos(wgStandorpolicyInfos1); @@ -262,27 +262,27 @@ public class WgWorkGroupServiceImpl extends ServiceImpl nums=new ArrayList<>(); - Map> map=new HashMap<>(); + List nums = new ArrayList<>(); + Map> map = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - if (null!=map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))){ + if (null != map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))) { map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel())).add(wgWorkGroupShowDTO); - }else { + } else { List middle = new ArrayList<>(); middle.add(wgWorkGroupShowDTO); nums.add(Integer.valueOf(wgWorkGroupShowDTO.getLevel())); - map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()),middle); + map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()), middle); } }); //组装数据 - for (int i=nums.size()-1;i>0;i--){ + for (int i = nums.size() - 1; i > 0; i--) { int finalI = i; - map.get(i-1).forEach(wgWorkGroupShowDTO -> { + map.get(i - 1).forEach(wgWorkGroupShowDTO -> { map.get(finalI).forEach(wgWorkGroupShowDTO1 -> { - if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())){ - if (null!=wgWorkGroupShowDTO.getChildren()) { + if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())) { + if (null != wgWorkGroupShowDTO.getChildren()) { wgWorkGroupShowDTO.getChildren().add(wgWorkGroupShowDTO1); - }else { + } else { List children = new ArrayList<>(); children.add(wgWorkGroupShowDTO1); wgWorkGroupShowDTO.setChildren(children); @@ -322,104 +322,139 @@ public class WgWorkGroupServiceImpl extends ServiceImpl updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(), "1"); + List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDatasCheck(wgWorkGroupShowDTO.getId(), "0"); if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) { return Result.error("工作组处在流程中,无法修改"); } else { - WgWorkGroup wgWorkGroup = new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); - boolean flag = false; - flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); - wgDeptService.removeByIds(strings); - } - List wgDepts=new ArrayList<>(); - wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { - WgDept wgDept=new WgDept(); - BeanUtils.copyProperties(wgDeptShow,wgDept); - if (null==wgDept.getWgId()){ - wgDept.setWgId(wgWorkGroupShowDTO.getId()); - } - wgDepts.add(wgDept); - }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); - } - if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); - wgDeptService.removeByIds(strings); - wgMeetingUserRelationService.removeByIds(strings); - } - List removeMeet = new ArrayList<>(); - List wgMeetingUserRelations = new ArrayList<>(); - wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { - if (null==wgMeetingInfo.getId()){ - wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); - wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgMeetingInfo.getMeetingPeople().forEach(s -> { - WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); - wgMeetingUserRelation.setUserId(s); - wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); - wgMeetingUserRelations.add(wgMeetingUserRelation); - }); - removeMeet.add(wgMeetingInfo.getId()); - }); - flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); - if (!removeMeet.isEmpty()) { - wgMeetingUserRelationService.removeByIds(removeMeet); - wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); - } - } - if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); - wgNetInfoService.removeByIds(strings); - } - List wgNetInfos = new ArrayList<>(); - wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { - WgNetInfo wgNetInfo = new WgNetInfo(); - BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); - if (null==wgNetInfo.getWgId()){ - wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgNetInfos.add(wgNetInfo); - }); - flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); - } - if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); - wgPayInfoService.removeByIds(strings); - } - if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { - if (null==wgPayInfo.getWgId()){ - wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); - } - if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { - if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - if (null==wgStandorpolicyInfo.getWgId()){ - wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); - } + return dealAllDatas(wgWorkGroupShowDTO); + } + } - if (flag) { - return Result.success("更新成功"); - } else { - return Result.error("无法更新"); + @Override + public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + return dealAllDatas(wgWorkGroupShowDTO); + } + + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); + boolean flag = false; + flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); + saveBathDept(wgWorkGroupShowDTO, flag); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag); + saveBathNetInfo(wgWorkGroupShowDTO, flag); + saveBathPayInfo(wgWorkGroupShowDTO, flag); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag); + + if (flag) { + return Result.success("更新成功"); + } else { + return Result.error("无法更新"); + } + } + + private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null == wgPayInfo.getWgId()) { + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + } + return flag; + } + + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } + List wgNetInfos = new ArrayList<>(); + wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { + WgNetInfo wgNetInfo = new WgNetInfo(); + BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null == wgNetInfo.getWgId()) { + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgNetInfos.add(wgNetInfo); + }); + flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); + } + return flag; + } + + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } + List removeMeet = new ArrayList<>(); + List wgMeetingUserRelations = new ArrayList<>(); + wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null == wgMeetingInfo.getId()) { + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgMeetingInfo.getMeetingPeople().forEach(s -> { + WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); + wgMeetingUserRelation.setUserId(s); + wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelations.add(wgMeetingUserRelation); + }); + removeMeet.add(wgMeetingInfo.getId()); + }); + flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + if (!removeMeet.isEmpty()) { + wgMeetingUserRelationService.removeByIds(removeMeet); + wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); } } + return flag; + } + + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } + List wgDepts = new ArrayList<>(); + wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { + WgDept wgDept = new WgDept(); + BeanUtils.copyProperties(wgDeptShow, wgDept); + if (null == wgDept.getWgId()) { + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } + wgDepts.add(wgDept); + }); + flag = wgDeptService.saveOrUpdateBatch(wgDepts); + } + return flag; + } + + + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null == wgStandorpolicyInfo.getWgId()) { + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + } + return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml index fde7c4e7..5c94098d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -45,6 +45,10 @@ select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} + +