|
|
@@ -103,20 +103,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
}
|
|
|
|
|
|
SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
|
|
|
- String[] source = sysAgencyLeaderDto.getSource();
|
|
|
- StringBuilder stringBuilder = new StringBuilder();
|
|
|
- if (source != null) {
|
|
|
- int size = source.length;
|
|
|
- if (size == 3) {
|
|
|
- stringBuilder.append(source[0]).append(",").append(source[1]).append(",").append(source[2]);
|
|
|
-
|
|
|
- } else if (size == 2) {
|
|
|
- stringBuilder.append(source[0]).append(",").append(source[1]);
|
|
|
- } else {
|
|
|
- stringBuilder.append(source[0]);
|
|
|
- }
|
|
|
- }
|
|
|
- sysAgencyLeader.setSource(stringBuilder.toString());
|
|
|
sysAgencyLeader.setCreateTime(new Date());
|
|
|
SysUser user = BaseController.getUser();
|
|
|
sysAgencyLeader.setCreateBy(user.getId());
|
|
|
@@ -151,22 +137,42 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
return b;
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public List<SysDept> getDeptInfo() {
|
|
|
- return sysDeptMapper.selectList(new QueryWrapper<SysDept>().lambda().eq(SysDept::getDelFlag, 0).isNotNull(SysDept::getComlevel));
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
- public List<SysUser> getUserInfo() {
|
|
|
- List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getStatus, 1).notLike(SysUser::getId,"M"));
|
|
|
- String id = BaseController.getUser().getId();
|
|
|
+ public List<SysUser> getLevelUser(String id) {
|
|
|
+ SysDept sysDept = sysDeptMapper.selectById(id);
|
|
|
List<SysUser> sysUserList = null;
|
|
|
- if (sysUsers.size() > 0) {
|
|
|
- sysUserList = sysUsers.stream().filter(SysUser -> !SysUser.getId().equals(id)).collect(Collectors.toList());
|
|
|
+ if (sysDept.getComlevel().equals("5")) {
|
|
|
+ sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
+ .eq(SysUser::getStatus, 1)
|
|
|
+ .likeRight(SysUser::getId, sysDept.getParentId())
|
|
|
+ .notLike(SysUser::getId, "M"));
|
|
|
+
|
|
|
+ } else {
|
|
|
+ sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
+ .eq(SysUser::getStatus, 1)
|
|
|
+ .likeRight(SysUser::getId, id)
|
|
|
+ .notLike(SysUser::getId, "M"));
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
+ //工作室管理员: 已是管理员不能再成为管理员,已是合伙人的也不能设置为管理员
|
|
|
+ List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getCreateTime, 1));
|
|
|
+ if (sysPartnerList == null) {
|
|
|
+ List<String> stringList = sysPartnerList.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
+ sysUserList = sysUserList.stream().filter(SysUser -> !stringList.contains(SysUser.getId())).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+ List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getDelFlag, 1));
|
|
|
+ if (sysAgencyLeaders == null) {
|
|
|
+ List<String> stringList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
|
|
|
+ sysUserList = sysUserList.stream().filter(SysUser -> !stringList.contains(SysUser.getId())).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+
|
|
|
return sysUserList;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean edit(SysAgencyLeaderDto sysAgencyLeaderDto) {
|
|
|
@@ -190,19 +196,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
|
|
|
}
|
|
|
SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
|
|
|
- String[] source = sysAgencyLeaderDto.getSource();
|
|
|
- StringBuilder stringBuilder = new StringBuilder();
|
|
|
- if (source != null) {
|
|
|
- int size = source.length;
|
|
|
- if (size == 3) {
|
|
|
- stringBuilder.append(source[0]).append(",").append(source[1]).append(",").append(source[2]);
|
|
|
- } else if (size == 2) {
|
|
|
- stringBuilder.append(source[0]).append(",").append(source[1]);
|
|
|
- } else {
|
|
|
- stringBuilder.append(source[0]);
|
|
|
- }
|
|
|
- }
|
|
|
- sysAgencyLeader.setSource(stringBuilder.toString());
|
|
|
sysAgencyLeader.setUpdateTime(new Date());
|
|
|
SysUser user = BaseController.getUser();
|
|
|
sysAgencyLeader.setUpdateBy(user.getId());
|
|
|
@@ -228,22 +221,11 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<SysAgencyLeaderVo> queryInfo() {
|
|
|
- List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
|
|
|
+ public List<SysAgencyLeaderVo> queryInfo(String id) {
|
|
|
+ List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
|
|
|
+ .eq(SysAgencyLeader::getDelFlag, 1).likeRight(StringUtils.isNotEmpty(id),SysAgencyLeader::getDeptId,id));
|
|
|
List<SysAgencyLeaderVo> sysAgencyLeaderVos = BeanUtil.copyToList(sysAgencyLeaders, SysAgencyLeaderVo.class);
|
|
|
- if (sysAgencyLeaders.size() > 0) {
|
|
|
- for (SysAgencyLeader record : sysAgencyLeaders) {
|
|
|
- for (SysAgencyLeaderVo sysAgencyLeaderVo : sysAgencyLeaderVos) {
|
|
|
- if (record.getId().equals(sysAgencyLeaderVo.getId())) {
|
|
|
- String source = record.getSource();
|
|
|
- if (!StringUtils.isNullOrEmpty(source)) {
|
|
|
- String[] split = source.split(",");
|
|
|
- sysAgencyLeaderVo.setSource(split);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
return sysAgencyLeaderVos;
|
|
|
}
|
|
|
|
|
|
@@ -252,27 +234,21 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
Page<SysAgencyLeader> page = new Page<>(sysAgencyLeaderPageDto.getPageNum(), sysAgencyLeaderPageDto.getPageSize());
|
|
|
LambdaQueryWrapper<SysAgencyLeader> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(SysAgencyLeader::getDelFlag, 1);
|
|
|
- wrapper.eq(!StringUtils.isNullOrEmpty(sysAgencyLeaderPageDto.getDeptId()), SysAgencyLeader::getDeptId, sysAgencyLeaderPageDto.getDeptId());
|
|
|
- wrapper.eq(!StringUtils.isNullOrEmpty(sysAgencyLeaderPageDto.getUserId()), SysAgencyLeader::getUserId, sysAgencyLeaderPageDto.getUserId());
|
|
|
- wrapper.eq(!StringUtils.isNullOrEmpty(sysAgencyLeaderPageDto.getSuggestId()), SysAgencyLeader::getSuggestId, sysAgencyLeaderPageDto.getSuggestId());
|
|
|
+ wrapper.likeRight(!StringUtils.isNullOrEmpty(sysAgencyLeaderPageDto.getDeptId()), SysAgencyLeader::getDeptId, sysAgencyLeaderPageDto.getDeptId());
|
|
|
wrapper.orderByAsc(SysAgencyLeader::getId);
|
|
|
|
|
|
Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
|
|
|
List<SysAgencyLeader> records = insOrdersPage.getRecords();
|
|
|
List<SysAgencyLeaderVo> sysAgencyLeaderVos = BeanUtil.copyToList(records, SysAgencyLeaderVo.class);
|
|
|
- if (records.size() > 0) {
|
|
|
- for (SysAgencyLeader record : records) {
|
|
|
- for (SysAgencyLeaderVo sysAgencyLeaderVo : sysAgencyLeaderVos) {
|
|
|
- if (record.getId().equals(sysAgencyLeaderVo.getId())) {
|
|
|
- String source = record.getSource();
|
|
|
- if (!StringUtils.isNullOrEmpty(source)) {
|
|
|
- String[] split = source.split(",");
|
|
|
- sysAgencyLeaderVo.setSource(split);
|
|
|
- }
|
|
|
- }
|
|
|
+ if (sysAgencyLeaderVos.size()>0) {
|
|
|
+ for (SysAgencyLeaderVo sysAgencyLeaderVo : sysAgencyLeaderVos) {
|
|
|
+ SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeaderVo.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
|
+ if (sysDept != null) {
|
|
|
+ sysAgencyLeaderVo.setParentId(sysDept.getParentId());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
return new BasePageResult<>(sysAgencyLeaderPageDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
|
|
|
sysAgencyLeaderVos);
|
|
|
}
|
|
|
@@ -283,11 +259,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
sysAgencyLeader.setId(id);
|
|
|
SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeader);
|
|
|
SysAgencyLeaderVo sysAgencyLeaderVo = BeanUtil.copyProperties(sysAgencyLeader1, SysAgencyLeaderVo.class);
|
|
|
- String source = sysAgencyLeader1.getSource();
|
|
|
- if (!StringUtils.isNullOrEmpty(source)) {
|
|
|
- String[] split = source.split(",");
|
|
|
- sysAgencyLeaderVo.setSource(split);
|
|
|
- }
|
|
|
+
|
|
|
return sysAgencyLeaderVo;
|
|
|
}
|
|
|
|
|
|
@@ -480,6 +452,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
|
|
|
Page<SysAgencyLeader> page = new Page<>(sysAgencyLeaderPageDto.getPageNum(), sysAgencyLeaderPageDto.getPageSize());
|
|
|
LambdaQueryWrapper<SysAgencyLeader> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserId()),SysAgencyLeader::getUserId,sysAgencyLeaderPageDto.getUserId());
|
|
|
+ wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserName()),SysAgencyLeader::getUserName,sysAgencyLeaderPageDto.getUserName());
|
|
|
wrapper.eq(SysAgencyLeader::getDelFlag, 1);
|
|
|
|
|
|
Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
|
|
|
@@ -515,7 +489,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
if (insOrderList.size() > 0) {
|
|
|
for (InsOrders insOrders : insOrderList) {
|
|
|
//查询订单下的所有子订单
|
|
|
- List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>().eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
+ List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
|
|
|
+ .eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
.eq(InsAreaCompany::getOrderstatus, 3));
|
|
|
if (insAreaCompanies.size() > 0) {
|
|
|
for (InsAreaCompany insAreaCompany : insAreaCompanies) {
|
|
|
@@ -558,223 +533,25 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
agencyExtractFeeList);
|
|
|
}
|
|
|
|
|
|
-// @Override
|
|
|
-// public List<TeamInformation> queryTeamInfo(TeamInformationDto teamInformationDto) {
|
|
|
-// String userId = BaseController.getUser().getId();
|
|
|
-// List<TeamInformation> informationList = new ArrayList<>();
|
|
|
-// //合伙人
|
|
|
-// boolean c = sysPartnerService.checkPartner(userId);
|
|
|
-// if (c) {
|
|
|
-// return extracted(userId, informationList, teamInformationDto);
|
|
|
-// }
|
|
|
-// //校验当前用户是否为机构负责人
|
|
|
-// boolean b = this.checkUserId(userId);
|
|
|
-// if (b) {
|
|
|
-// //机构负责人查询机构下的团队
|
|
|
-// SysAgencyLeader sysAgencyLeaders = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getUserId, userId)
|
|
|
-// .eq(SysAgencyLeader::getDelFlag, 1));
|
|
|
-// String[] split = sysAgencyLeaders.getSource().split(",");
|
|
|
-// //根据当前机构id查询出下面的团队,条件:机构来源相同,机构等级为null的团队
|
|
|
-// List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().likeRight(SysDept::getId, sysAgencyLeaders.getDeptId())
|
|
|
-// .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0).in(SysDept::getManagementSource, split)
|
|
|
-// .like(StringUtils.isNotEmpty(teamInformationDto.getDeptName()), SysDept::getName, teamInformationDto.getDeptName()));
|
|
|
-// if (sysDeptList.size() > 0) {
|
|
|
-// //总保费
|
|
|
-// BigDecimal bigDecimal = new BigDecimal("0.00");
|
|
|
-// for (SysDept sysDept : sysDeptList) {
|
|
|
-// TeamInformation teamInformation = new TeamInformation();
|
|
|
-// teamInformation.setDeptId(sysDept.getId());
|
|
|
-// teamInformation.setDeptName(sysDept.getName());
|
|
|
-// List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().likeRight(SysUser::getId, sysDept.getId()).eq(SysUser::getStatus, 1));
|
|
|
-// teamInformation.setDeptManNum(sysUsers.size());
|
|
|
-// List<InsOrders> insOrderList;
|
|
|
-// //筛选订单,选择时间
|
|
|
-// Date updateTime = sysAgencyLeaders.getUpdateTime();
|
|
|
-// if (updateTime == null) {
|
|
|
-// //机构下所有订单
|
|
|
-// insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
|
|
|
-// .likeRight(InsOrders::getDeptid, sysDept.getId())
|
|
|
-// .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime())
|
|
|
-// .ge(StringUtils.isNotEmpty(teamInformationDto.getBeginTime()), InsOrders::getCreatetime, teamInformationDto.getBeginTime())
|
|
|
-// .le(StringUtils.isNotEmpty(teamInformationDto.getEndTime()), InsOrders::getCreatetime, teamInformationDto.getEndTime()));
|
|
|
-// teamInformation.setStartTime(sysAgencyLeaders.getCreateTime());
|
|
|
-//
|
|
|
-// } else {
|
|
|
-// insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
|
|
|
-// .likeRight(InsOrders::getDeptid, sysDept.getId())
|
|
|
-// .ge(InsOrders::getCreatetime, updateTime)
|
|
|
-// .ge(StringUtils.isNotEmpty(teamInformationDto.getBeginTime()), InsOrders::getCreatetime, teamInformationDto.getBeginTime())
|
|
|
-// .le(StringUtils.isNotEmpty(teamInformationDto.getEndTime()), InsOrders::getCreatetime, teamInformationDto.getEndTime()));
|
|
|
-// teamInformation.setStartTime(updateTime);
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (insOrderList.size() > 0) {
|
|
|
-// for (InsOrders insOrders : insOrderList) {
|
|
|
-// //查询订单下的所有子订单
|
|
|
-// List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>().eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
-// .eq(InsAreaCompany::getOrderstatus, 3));
|
|
|
-// if (insAreaCompanies.size() > 0) {
|
|
|
-// for (InsAreaCompany insAreaCompany : insAreaCompanies) {
|
|
|
-// //累加每一个子订单的交强险费用+商业险费用+驾意险费用
|
|
|
-// bigDecimal = bigDecimal.add(insAreaCompany.getJqpremium()).add(insAreaCompany.getSypremium()).add(insAreaCompany.getJypremium());
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// teamInformation.setSumpremium(bigDecimal);
|
|
|
-// int num = 0;
|
|
|
-// // 查团队有几人出单 :订单表中userid相等同时在 子订单表中状态为3已承保才为出单
|
|
|
-// List<String> userIdList = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
|
|
|
-// for (String s : userIdList) {
|
|
|
-// List<InsOrders> collect = insOrderList.stream().filter(InsOrders -> InsOrders.getUserid().equals(s)).collect(Collectors.toList());
|
|
|
-// if (collect.size() > 0) {
|
|
|
-// InsOrders insOrders = collect.get(0);
|
|
|
-// List<InsAreaCompany> insAreaCompanies1 = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>().eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
-// .eq(InsAreaCompany::getOrderstatus, 3));
|
|
|
-// if (insAreaCompanies1.size() > 0) {
|
|
|
-// num++;
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// teamInformation.setOrderManNum(num);
|
|
|
-// informationList.add(teamInformation);
|
|
|
-// Integer type = teamInformationDto.getType();
|
|
|
-// if (type == 1) {
|
|
|
-// int size = informationList.size();
|
|
|
-// if (size == 2) {
|
|
|
-// return informationList;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// return informationList;
|
|
|
-// }
|
|
|
-//
|
|
|
-//
|
|
|
-// return informationList;
|
|
|
-// }
|
|
|
-//
|
|
|
-// private List<TeamInformation> extracted(String userId, List<TeamInformation> informationList, TeamInformationDto teamInformationDto) {
|
|
|
-// //查询所有推荐的机构负责人核算总保费
|
|
|
-// List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
|
-// .eq(SysRelationPerson::getSuggestId, userId).eq(SysRelationPerson::getType, 1));
|
|
|
-// if (sysRelationPeople.size() > 0) {
|
|
|
-// //总保费
|
|
|
-// BigDecimal bigDecimal = new BigDecimal("0.00");
|
|
|
-// //获取所有推荐的机构负责人id
|
|
|
-// List<String> agencyLeaderIds = sysRelationPeople.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
|
|
|
-// for (String agencyLeaderId : agencyLeaderIds) {
|
|
|
-// //获取机构负责人信息
|
|
|
-// SysAgencyLeader sysAgencyLeaders = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
|
|
|
-// .eq(SysAgencyLeader::getUserId, agencyLeaderId)
|
|
|
-// .eq(SysAgencyLeader::getDelFlag, 1));
|
|
|
-// String[] split = sysAgencyLeaders.getSource().split(",");
|
|
|
-// //根据当前机构id查询出下面的团队,条件:机构来源相同,机构等级为null的团队
|
|
|
-// List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
|
|
|
-// .likeRight(SysDept::getId, sysAgencyLeaders.getDeptId())
|
|
|
-// .isNull(SysDept::getComlevel)
|
|
|
-// .eq(SysDept::getDelFlag, 0)
|
|
|
-// .in(SysDept::getManagementSource, split)
|
|
|
-// .like(StringUtils.isNotEmpty(teamInformationDto.getDeptName()), SysDept::getName, teamInformationDto.getDeptName()));
|
|
|
-// if (sysDeptList.size() > 0) {
|
|
|
-// for (SysDept sysDept : sysDeptList) {
|
|
|
-// TeamInformation teamInformation = new TeamInformation();
|
|
|
-// teamInformation.setDeptId(sysDept.getId());
|
|
|
-// teamInformation.setDeptName(sysDept.getName());
|
|
|
-// List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
|
|
-// .likeRight(SysUser::getId, sysDept.getId())
|
|
|
-// .eq(SysUser::getStatus, 1));
|
|
|
-// teamInformation.setDeptManNum(sysUsers.size());
|
|
|
-// List<InsOrders> insOrderList;
|
|
|
-// //筛选订单,选择时间
|
|
|
-// Date updateTime = sysAgencyLeaders.getUpdateTime();
|
|
|
-// if (updateTime == null) {
|
|
|
-// //机构下所有订单
|
|
|
-// insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
|
|
|
-// .likeRight(InsOrders::getDeptid, sysDept.getId())
|
|
|
-// .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime())
|
|
|
-// .ge(StringUtils.isNotEmpty(teamInformationDto.getBeginTime()), InsOrders::getCreatetime, teamInformationDto.getBeginTime())
|
|
|
-// .le(StringUtils.isNotEmpty(teamInformationDto.getEndTime()), InsOrders::getCreatetime, teamInformationDto.getEndTime()));
|
|
|
-// teamInformation.setStartTime(sysAgencyLeaders.getCreateTime());
|
|
|
-// } else {
|
|
|
-// insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
|
|
|
-// .likeRight(InsOrders::getDeptid, sysDept.getId())
|
|
|
-// .ge(InsOrders::getCreatetime, updateTime)
|
|
|
-// .ge(StringUtils.isNotEmpty(teamInformationDto.getBeginTime()), InsOrders::getCreatetime, teamInformationDto.getBeginTime())
|
|
|
-// .le(StringUtils.isNotEmpty(teamInformationDto.getEndTime()), InsOrders::getCreatetime, teamInformationDto.getEndTime()));
|
|
|
-// teamInformation.setStartTime(updateTime);
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (insOrderList.size() > 0) {
|
|
|
-// for (InsOrders insOrders : insOrderList) {
|
|
|
-// //查询订单下的所有子订单
|
|
|
-// List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
|
|
|
-// .eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
-// .eq(InsAreaCompany::getOrderstatus, 3));
|
|
|
-// if (insAreaCompanies.size() > 0) {
|
|
|
-// for (InsAreaCompany insAreaCompany : insAreaCompanies) {
|
|
|
-// //累加每一个子订单的交强险费用+商业险费用+驾意险费用
|
|
|
-// bigDecimal = bigDecimal.add(insAreaCompany.getJqpremium()).add(insAreaCompany.getSypremium()).add(insAreaCompany.getJypremium());
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// teamInformation.setSumpremium(bigDecimal);
|
|
|
-// int num = 0;
|
|
|
-// // 查团队有几人出单 :子订单中userid相等同时在 子订单表中状态为3已承保才为出单
|
|
|
-// List<String> userIdList = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
|
|
|
-// for (String s : userIdList) {
|
|
|
-// List<InsOrders> collect = insOrderList.stream().filter(InsOrders -> InsOrders.getUserid().equals(s)).collect(Collectors.toList());
|
|
|
-// if (collect.size() > 0) {
|
|
|
-// InsOrders insOrders = collect.get(0);
|
|
|
-// List<InsAreaCompany> insAreaCompanies1 = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
|
|
|
-// .eq(InsAreaCompany::getOrderno, insOrders.getOrderno())
|
|
|
-// .eq(InsAreaCompany::getOrderstatus, 3));
|
|
|
-// if (insAreaCompanies1.size() > 0) {
|
|
|
-// num++;
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// teamInformation.setOrderManNum(num);
|
|
|
-// informationList.add(teamInformation);
|
|
|
-// Integer type = teamInformationDto.getType();
|
|
|
-// if (type == 1) {
|
|
|
-// int size = informationList.size();
|
|
|
-// if (size == 2) {
|
|
|
-// return informationList;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// return informationList;
|
|
|
-// }
|
|
|
-
|
|
|
|
|
|
@Override
|
|
|
public BasePageResult<TeamInformation> queryTeamInfoPage(TeamInformationDto teamInformationDto) {
|
|
|
String userId = teamInformationDto.getUserId();
|
|
|
if (userId == null) {
|
|
|
- userId=BaseController.getUserId();
|
|
|
+ userId = BaseController.getUserId();
|
|
|
}
|
|
|
List<TeamInformation> informationList = new ArrayList<>();
|
|
|
//机构负责人查询机构下的团队
|
|
|
SysAgencyLeader sysAgencyLeaders = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getUserId, userId)
|
|
|
.eq(SysAgencyLeader::getDelFlag, 1));
|
|
|
if (sysAgencyLeaders == null) return null;
|
|
|
- String[] split = sysAgencyLeaders.getSource().split(",");
|
|
|
+// String[] split = sysAgencyLeaders.getSource().split(",");
|
|
|
|
|
|
Page<SysDept> page = new Page<>(teamInformationDto.getPageNum(), teamInformationDto.getPageSize());
|
|
|
|
|
|
LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.likeRight(SysDept::getId, sysAgencyLeaders.getDeptId())
|
|
|
- .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0).in(SysDept::getManagementSource, split)
|
|
|
+ .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0).eq(SysDept::getManagementSource, sysAgencyLeaders.getSource())
|
|
|
.like(StringUtils.isNotEmpty(teamInformationDto.getDeptName()), SysDept::getName, teamInformationDto.getDeptName());
|
|
|
|
|
|
Page<SysDept> insOrdersPage = sysDeptService.page(page, wrapper);
|