Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!284

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 = "单位名称")
+    @ApiModelProperty(value = "单位")
-    private String unitName;
+    private String unitId;
 
     @ApiModelProperty(value = "电话")
     private String phone;

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 = "单位名称")
+    @ApiModelProperty(value = "单位")
-    private String unitName;
+    private String unitId;
 
     @ApiModelProperty(value = "电话")
     private String phone;

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java

@@ -74,18 +74,26 @@ public class WgWorkGroupShowDTO extends BaseEntity {
     //支付信息
     List<WgPayInfo> wgPayInfos;
 
+    private String wgPayInfosDel;
+
     //标准政策
     List<WgStandorpolicyInfo> wgStandorpolicyInfos;
 
     //集团参与情况
     List<WgDeptShow> wgDepts;
 
+    private String wgDeptsDel;
+
     //秘书联系方式
     List<WgNetInfoDTO> wgNetInfos;
 
+    private String wgNetInfosDel;
+
     //参会记录及资料
     List<WgMeetingInfo> wgMeetingInfos;
 
+    private String wgMeetingInfosDel;
+
     List<WgWorkGroupShowDTO> children;
 
 

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<WgWorkGroupDao, WgWorkGr
             boolean flag = false;
             flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup);
             if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) {
+                if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){
+                    List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(",")));
+                    wgDeptService.removeByIds(strings);
+                }
                 List<WgDept> wgDepts=new ArrayList<>();
                 wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
                     WgDept wgDept=new WgDept();
@@ -342,6 +347,11 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 flag = wgDeptService.saveOrUpdateBatch(wgDepts);
             }
             if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) {
+                if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){
+                    List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(",")));
+                    wgDeptService.removeByIds(strings);
+                    wgMeetingUserRelationService.removeByIds(strings);
+                }
                 List<String> removeMeet = new ArrayList<>();
                 List<WgMeetingUserRelation> wgMeetingUserRelations = new ArrayList<>();
                 wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> {
@@ -364,6 +374,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 }
             }
             if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) {
+                if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){
+                    List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(",")));
+                    wgNetInfoService.removeByIds(strings);
+                }
                 List<WgNetInfo> wgNetInfos = new ArrayList<>();
                 wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> {
                     WgNetInfo wgNetInfo = new WgNetInfo();
@@ -376,6 +390,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
             }
             if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) {
+                if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){
+                    List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(",")));
+                    wgPayInfoService.removeByIds(strings);
+                }
                 if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){
                     wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> {
                         if (null==wgPayInfo.getWgId()){

adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml

@@ -12,8 +12,8 @@
     </select>
 
     <select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
-        select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
+        select wg_dept.* ,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
-        ,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
+        ,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unit , ts_institution.id as unitId
         from wg_dept
         left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
         left join wg_work_group on wg_work_group.id = wg_dept.wg_id

adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml

@@ -12,7 +12,7 @@
 
     <select id="getMeetingAllPeoples"
             resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
-        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

adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml

@@ -11,11 +11,12 @@
     </select>
 
     <select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
-      select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
+      select wg_net_info.net_id,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
-      ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
+      ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id ,ts_institution.name as unit , ts_institution.id as unitId
       from   wg_net_info
       left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
       left join wg_work_group on wg_work_group.id = wg_net_info.wg_id
+      left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
         where wg_work_group.type = #{type}
     </select>