From 99f33ac21839115141116ee45c6bf2a72084bd01 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 10:14:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=20=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java | 6 +++--- .../java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java | 6 +++--- .../main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml | 4 ++-- .../wgMeetingUserRelation/WgMeetingUserRelationMapper.xml | 2 +- .../resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml | 5 +++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java index db6423e3..5711d5a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java @@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java index cdf47254..2b2e48a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java @@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml index 6a3e67df..2cc02e2e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -12,8 +12,8 @@ - select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation + select wg_meeting_user_relation.*,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name from wg_meeting_user_relation left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id 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 0d2d005c..97768a6b 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,11 +11,12 @@ From 67deb52111f73065c112ff799de9dd1be0218b7e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 11:05:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=B8=8B=20?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B1=9E=E6=80=A7=E5=88=A0=E9=99=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgWorkGroup/entity/WgWorkGroupShowDTO.java | 8 ++++++++ .../service/impl/WgWorkGroupServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java index 5e736116..7dd662bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java @@ -74,18 +74,26 @@ public class WgWorkGroupShowDTO extends BaseEntity { //支付信息 List wgPayInfos; + private String wgPayInfosDel; + //标准政策 List wgStandorpolicyInfos; //集团参与情况 List wgDepts; + private String wgDeptsDel; + //秘书联系方式 List wgNetInfos; + private String wgNetInfosDel; + //参会记录及资料 List wgMeetingInfos; + private String wgMeetingInfosDel; + List children; 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 0c88d87d..2525d233 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 @@ -25,6 +25,7 @@ import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -330,6 +331,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 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(); @@ -342,6 +347,11 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 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 -> { @@ -364,6 +374,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 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(); @@ -376,6 +390,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 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()){