From ed4782aa5419891b43293560c2bc0b9fd6860601 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 14 Jul 2025 14:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EquTeamServiceImpl.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java index 07b2ac387..29c01e731 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java @@ -87,24 +87,24 @@ public class EquTeamServiceImpl implements IEquTeamService { String key = "#header.poolName"; equTeam.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); equTeamMapper.insertEquTeam(equTeam); - //新增设备班组人员信息 - String teamId = equTeam.getId(); - for (int i = 0; i < equTeam.getRightData().size(); i++) { - EquTeamUser equTeamUser = new EquTeamUser(); - equTeamUser.setCreateBy(SecurityUtils.getUsername()); - equTeamUser.setCreateTime(DateUtils.getNowDate()); - equTeamUser.setTeamId(teamId); - equTeamUser.setTeamCode(equTeam.getTeamCode()); - equTeamUser.setId(IdUtils.fastSimpleUUID()); - List list = new ArrayList<>(); - list = equTeam.getRightData(); - String userId = list.get(i); - equTeamUser.setUserId(userId); -// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); -// equTeamUser.setUserName(memberList.getUserName()); -// equTeamUser.setNickName(memberList.getNickName()); - equTeamUserMapper.insertEquTeamUser(equTeamUser); - } +// //新增设备班组人员信息 +// String teamId = equTeam.getId(); +// for (int i = 0; i < equTeam.getRightData().size(); i++) { +// EquTeamUser equTeamUser = new EquTeamUser(); +// equTeamUser.setCreateBy(SecurityUtils.getUsername()); +// equTeamUser.setCreateTime(DateUtils.getNowDate()); +// equTeamUser.setTeamId(teamId); +// equTeamUser.setTeamCode(equTeam.getTeamCode()); +// equTeamUser.setId(IdUtils.fastSimpleUUID()); +// List list = new ArrayList<>(); +// list = equTeam.getRightData(); +// String userId = list.get(i); +// equTeamUser.setUserId(userId); +//// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); +//// equTeamUser.setUserName(memberList.getUserName()); +//// equTeamUser.setNickName(memberList.getNickName()); +// equTeamUserMapper.insertEquTeamUser(equTeamUser); +// } return success("新增设备班组成功!"); } catch (Exception e) { return error(); @@ -122,25 +122,25 @@ public class EquTeamServiceImpl implements IEquTeamService { @Transactional public AjaxResult updateEquTeam(EquTeam equTeam) { try { - equTeam.setUpdateTime(DateUtils.getNowDate()); - equTeam.setUpdateBy(SecurityUtils.getUsername()); - equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId()); +// equTeam.setUpdateTime(DateUtils.getNowDate()); +// equTeam.setUpdateBy(SecurityUtils.getUsername()); +// equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId()); equTeamMapper.updateEquTeam(equTeam); - for (int i = 0; i < equTeam.getRightData().size(); i++) { - EquTeamUser equTeamUser = new EquTeamUser(); - equTeamUser.setCreateBy(SecurityUtils.getUsername()); - equTeamUser.setCreateTime(DateUtils.getNowDate()); - equTeamUser.setTeamId(equTeam.getId()); - equTeamUser.setTeamCode(equTeam.getTeamCode()); - equTeamUser.setId(IdUtils.fastSimpleUUID()); - List list = new ArrayList<>(); - list = equTeam.getRightData(); - String userId = list.get(i); - equTeamUser.setUserId(userId); -// String userName = equTeamUserMapper.selectUserName(equTeamUser); -// equTeamUser.setUserName(userName); - equTeamUserMapper.insertEquTeamUser(equTeamUser); - } +// for (int i = 0; i < equTeam.getRightData().size(); i++) { +// EquTeamUser equTeamUser = new EquTeamUser(); +// equTeamUser.setCreateBy(SecurityUtils.getUsername()); +// equTeamUser.setCreateTime(DateUtils.getNowDate()); +// equTeamUser.setTeamId(equTeam.getId()); +// equTeamUser.setTeamCode(equTeam.getTeamCode()); +// equTeamUser.setId(IdUtils.fastSimpleUUID()); +// List list = new ArrayList<>(); +// list = equTeam.getRightData(); +// String userId = list.get(i); +// equTeamUser.setUserId(userId); +//// String userName = equTeamUserMapper.selectUserName(equTeamUser); +//// equTeamUser.setUserName(userName); +// equTeamUserMapper.insertEquTeamUser(equTeamUser); +// } return success("修改设备班组成功!"); } catch (Exception e) { return error();