工作组bug修复

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;
+
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java

@@ -326,25 +326,25 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
         if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) {
             return Result.error("工作组处在流程中，无法修改");
         } else {
-            return dealAllDatas(wgWorkGroupShowDTO);
+            return dealAllDatas(wgWorkGroupShowDTO,"sys");
         }
     }
 
     @Override
     public ResponseMessage<Object> updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
-        return dealAllDatas(wgWorkGroupShowDTO);
+        return dealAllDatas(wgWorkGroupShowDTO,"wk");
     }
 
-    private ResponseMessage<Object> dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
+    private ResponseMessage<Object> dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO,String part) {
         WgWorkGroup wgWorkGroup = new WgWorkGroup();
         BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup);
         boolean flag = false;
         flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup);
-        saveBathDept(wgWorkGroupShowDTO, flag);
+        saveBathDept(wgWorkGroupShowDTO, flag,part);
-        saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag);
+        saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag,part);
-        saveBathNetInfo(wgWorkGroupShowDTO, flag);
+        saveBathNetInfo(wgWorkGroupShowDTO, flag,part);
-        saveBathPayInfo(wgWorkGroupShowDTO, flag);
+        saveBathPayInfo(wgWorkGroupShowDTO, flag,part);
-        saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag);
+        saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag,part);
 
         if (flag) {
             return Result.success("更新成功");
@@ -353,7 +353,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
         }
     }
 
-    private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
+    private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) {
         if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) {
             if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) {
                 List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(",")));
@@ -367,11 +367,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 });
             }
             flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
+        }else if ("sys".equals(part)){
+            QueryWrapper<WgPayInfo> 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<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(",")));
@@ -387,11 +391,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 wgNetInfos.add(wgNetInfo);
             });
             flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
+        }else if ("sys".equals(part)) {
+            QueryWrapper<WgNetInfo> 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<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(",")));
@@ -418,11 +426,23 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 wgMeetingUserRelationService.removeByIds(removeMeet);
                 wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
             }
+        }else if ("sys".equals(part)) {
+            QueryWrapper<WgMeetingInfo> queryWrapper=new QueryWrapper<>();
+            queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId());
+            wgMeetingInfoService.remove(queryWrapper);
+            List<WgMeetingInfo> wgMeetingInfos=wgMeetingInfoService.list(queryWrapper);
+            List<String> 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<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(",")));
@@ -438,12 +458,16 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
                 wgDepts.add(wgDept);
             });
             flag = wgDeptService.saveOrUpdateBatch(wgDepts);
+        }else if ("sys".equals(part)) {
+            QueryWrapper<WgDept> 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<WgWorkGroupDao, WgWorkGr
                 });
             }
             flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos());
+        }else if ("sys".equals(part)) {
+            QueryWrapper<WgStandorpolicyInfo> queryWrapper=new QueryWrapper<>();
+            queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId());
+            wgStandorpolicyInfoService.remove(queryWrapper);
         }
         return flag;
     }

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

@@ -11,13 +11,11 @@
     </select>
 
     <select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
-      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
+      select wg_net_info.net_id,wg_net_info.name 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 ,ts_institution.name as unit , ts_institution.id as unitId
+      ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id ,wg_net_info.unit as unit
       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}
-        where wg_work_group.type = #{type}
     </select>
 
 </mapper>