diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 6ec1cf93..f671536f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -52,6 +52,14 @@ public class WgNetInfo extends BaseEntity { @TableField("email") private String email; + @ApiModelProperty(value = "联络人") + @TableField("name") + private String name; + + @ApiModelProperty(value = "单位") + @TableField("unit") + private String unit; + } 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 e30304b5..aeee43bc 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 @@ -326,25 +326,25 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { return Result.error("工作组处在流程中,无法修改"); } else { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"sys"); } } @Override public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"wk"); } - private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO,String part) { 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); + saveBathDept(wgWorkGroupShowDTO, flag,part); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag,part); + saveBathNetInfo(wgWorkGroupShowDTO, flag,part); + saveBathPayInfo(wgWorkGroupShowDTO, flag,part); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag,part); if (flag) { return Result.success("更新成功"); @@ -353,7 +353,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); @@ -367,11 +367,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgPayInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); @@ -387,11 +391,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgNetInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); @@ -418,11 +426,23 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgMeetingInfoService.remove(queryWrapper); + List wgMeetingInfos=wgMeetingInfoService.list(queryWrapper); + List removeIds=new ArrayList<>(); + wgMeetingInfos.forEach(wgMeetingInfo -> { + removeIds.add(wgMeetingInfo.getId()); + }); + if (removeIds.size()>0) { + wgMeetingUserRelationService.removeByIds(removeIds); + } } return flag; } - private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); @@ -438,12 +458,16 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgDeptService.remove(queryWrapper); } return flag; } - private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { @@ -453,6 +477,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgStandorpolicyInfoService.remove(queryWrapper); } return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 97768a6b..f7f5dd81 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,13 +11,11 @@