|
|
@ -87,24 +87,24 @@ public class EquTeamServiceImpl implements IEquTeamService {
|
|
|
|
String key = "#header.poolName";
|
|
|
|
String key = "#header.poolName";
|
|
|
|
equTeam.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
|
|
|
|
equTeam.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
|
|
|
|
equTeamMapper.insertEquTeam(equTeam);
|
|
|
|
equTeamMapper.insertEquTeam(equTeam);
|
|
|
|
//新增设备班组人员信息
|
|
|
|
// //新增设备班组人员信息
|
|
|
|
String teamId = equTeam.getId();
|
|
|
|
// String teamId = equTeam.getId();
|
|
|
|
for (int i = 0; i < equTeam.getRightData().size(); i++) {
|
|
|
|
// for (int i = 0; i < equTeam.getRightData().size(); i++) {
|
|
|
|
EquTeamUser equTeamUser = new EquTeamUser();
|
|
|
|
// EquTeamUser equTeamUser = new EquTeamUser();
|
|
|
|
equTeamUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
// equTeamUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
equTeamUser.setCreateTime(DateUtils.getNowDate());
|
|
|
|
// equTeamUser.setCreateTime(DateUtils.getNowDate());
|
|
|
|
equTeamUser.setTeamId(teamId);
|
|
|
|
// equTeamUser.setTeamId(teamId);
|
|
|
|
equTeamUser.setTeamCode(equTeam.getTeamCode());
|
|
|
|
// equTeamUser.setTeamCode(equTeam.getTeamCode());
|
|
|
|
equTeamUser.setId(IdUtils.fastSimpleUUID());
|
|
|
|
// equTeamUser.setId(IdUtils.fastSimpleUUID());
|
|
|
|
List<String> list = new ArrayList<>();
|
|
|
|
// List<String> list = new ArrayList<>();
|
|
|
|
list = equTeam.getRightData();
|
|
|
|
// list = equTeam.getRightData();
|
|
|
|
String userId = list.get(i);
|
|
|
|
// String userId = list.get(i);
|
|
|
|
equTeamUser.setUserId(userId);
|
|
|
|
// equTeamUser.setUserId(userId);
|
|
|
|
// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
|
|
|
|
//// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
|
|
|
|
// equTeamUser.setUserName(memberList.getUserName());
|
|
|
|
//// equTeamUser.setUserName(memberList.getUserName());
|
|
|
|
// equTeamUser.setNickName(memberList.getNickName());
|
|
|
|
//// equTeamUser.setNickName(memberList.getNickName());
|
|
|
|
equTeamUserMapper.insertEquTeamUser(equTeamUser);
|
|
|
|
// equTeamUserMapper.insertEquTeamUser(equTeamUser);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return success("新增设备班组成功!");
|
|
|
|
return success("新增设备班组成功!");
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
return error();
|
|
|
|
return error();
|
|
|
@ -122,25 +122,25 @@ public class EquTeamServiceImpl implements IEquTeamService {
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public AjaxResult updateEquTeam(EquTeam equTeam) {
|
|
|
|
public AjaxResult updateEquTeam(EquTeam equTeam) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
equTeam.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
// equTeam.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
equTeam.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
// equTeam.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId());
|
|
|
|
// equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId());
|
|
|
|
equTeamMapper.updateEquTeam(equTeam);
|
|
|
|
equTeamMapper.updateEquTeam(equTeam);
|
|
|
|
for (int i = 0; i < equTeam.getRightData().size(); i++) {
|
|
|
|
// for (int i = 0; i < equTeam.getRightData().size(); i++) {
|
|
|
|
EquTeamUser equTeamUser = new EquTeamUser();
|
|
|
|
// EquTeamUser equTeamUser = new EquTeamUser();
|
|
|
|
equTeamUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
// equTeamUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
equTeamUser.setCreateTime(DateUtils.getNowDate());
|
|
|
|
// equTeamUser.setCreateTime(DateUtils.getNowDate());
|
|
|
|
equTeamUser.setTeamId(equTeam.getId());
|
|
|
|
// equTeamUser.setTeamId(equTeam.getId());
|
|
|
|
equTeamUser.setTeamCode(equTeam.getTeamCode());
|
|
|
|
// equTeamUser.setTeamCode(equTeam.getTeamCode());
|
|
|
|
equTeamUser.setId(IdUtils.fastSimpleUUID());
|
|
|
|
// equTeamUser.setId(IdUtils.fastSimpleUUID());
|
|
|
|
List<String> list = new ArrayList<>();
|
|
|
|
// List<String> list = new ArrayList<>();
|
|
|
|
list = equTeam.getRightData();
|
|
|
|
// list = equTeam.getRightData();
|
|
|
|
String userId = list.get(i);
|
|
|
|
// String userId = list.get(i);
|
|
|
|
equTeamUser.setUserId(userId);
|
|
|
|
// equTeamUser.setUserId(userId);
|
|
|
|
// String userName = equTeamUserMapper.selectUserName(equTeamUser);
|
|
|
|
//// String userName = equTeamUserMapper.selectUserName(equTeamUser);
|
|
|
|
// equTeamUser.setUserName(userName);
|
|
|
|
//// equTeamUser.setUserName(userName);
|
|
|
|
equTeamUserMapper.insertEquTeamUser(equTeamUser);
|
|
|
|
// equTeamUserMapper.insertEquTeamUser(equTeamUser);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return success("修改设备班组成功!");
|
|
|
|
return success("修改设备班组成功!");
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
return error();
|
|
|
|
return error();
|
|
|
|