人员统计

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -424,7 +424,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     //可提现 = 总抽成-已提现
                     agencyExtractFee.setCashFee(extractFee.subtract(historyFee));
 
-                }else {
+                } else {
                     agencyExtractFee.setSumpremium(BigDecimal.ZERO);
                     agencyExtractFee.setExtractFee(BigDecimal.ZERO);
                     agencyExtractFee.setHistoryFee(BigDecimal.ZERO);
@@ -760,7 +760,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysRelationPerson::getSuggestId, userId)
                     .eq(SysRelationPerson::getDelFlag, 1)
                     .eq(SysRelationPerson::getType, 1));
-            if (sysRelationPersonList2.size()>0) {
+            if (sysRelationPersonList2.size() > 0) {
                 List<String> ids = sysRelationPersonList2.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
                 List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
                         .in(CollectionUtil.isNotEmpty(ids), SysAgencyLeader::getUserId, ids).eq(SysAgencyLeader::getDelFlag, 1));
@@ -825,7 +825,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
             appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
             appUserInfoVo.setLevel(sysPartner.getType());
-        }else {
+        } else {
             SysPartnerConfig sysPartnerConfig = sysPartnerConfigMapper.selectOne(new LambdaQueryWrapper<SysPartnerConfig>()
                     .eq(SysPartnerConfig::getDelFlag, 1).eq(SysPartnerConfig::getLevel, 0));
             appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
@@ -1093,7 +1093,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 .eq(SysRelationPerson::getSource, 0)
                 .eq(SysRelationPerson::getType, 1));
         appSysPartnerVo.setWorkNumber(sysRelationPersons.size());
-        if (sysRelationPersons.size()>0) {
+        if (sysRelationPersons.size() > 0) {
 
             List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
             appSysPartnerVo.setLeaderIds(list1);
@@ -1103,7 +1103,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
                             SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
                     .eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector()));
-            if (sysPremiumDetails1.size()>0) {
+            if (sysPremiumDetails1.size() > 0) {
 
                 BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1615,10 +1615,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         if (sysRelationPersonList.size() > 0) {
             List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
 
-            if (collect.size() >4) {
+            if (collect.size() > 4) {
                 List<String> collect1 = collect.stream().limit(4).collect(Collectors.toList());
                 ids.addAll(collect1);
-            }else {
+            } else {
                 ids.addAll(collect);
 
             }
@@ -1630,10 +1630,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         if (sysRelationList.size() > 0) {
 
             List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-            if (collect1.size()>4) {
+            if (collect1.size() > 4) {
                 List<String> collect2 = collect1.stream().limit(4).collect(Collectors.toList());
                 ids.addAll(collect2);
-            }else {
+            } else {
                 ids.addAll(collect1);
 
             }
@@ -1645,7 +1645,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             sysPartners.addAll(sysPartnerVos);
         }
         List<SysPartnerVo> sysPartnerVoList = sysPartners.stream().sorted(Comparator.comparing(SysPartner::getId)).collect(Collectors.toList());
-        if (sysPartnerVoList.size()>0) {
+        if (sysPartnerVoList.size() > 0) {
             for (SysPartnerVo partner : sysPartnerVoList) {
                 SysUser sysUser1 = sysUserMapper.selectById(partner.getUserId());
                 partner.setMobile(sysUser1.getMobile());
@@ -1676,44 +1676,46 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         String endTime1 = countUserDto.getEndTime();
 
         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getReferrerId,userId)
-                .eq(SysUser::getType,3)
-                .in(SysUser::getStatus,Arrays.asList(1, 4, 5, 6, 7))
+                .eq(SysUser::getReferrerId, userId)
+                .eq(SysUser::getType, 3)
+                .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7))
                 .between(StringUtils.isNotEmpty(countUserDto.getBeginTime()) && StringUtils.isNotEmpty(countUserDto.getEndTime())
-                        ,SysUser::getCreateTime,countUserDto.getBeginTime(),countUserDto.getEndTime()));
-        if (sysUsers != null) {
-            countUserVo.setDeptSum(sysUsers.size());
-
-            List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
-            int deptManNum=0;
-            for (String deptId : deptIds) {
-                List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                        .likeRight(SysUser::getId,deptId)
-                        .in(SysUser::getStatus,Arrays.asList(1, 4, 5, 6, 7)));
-                deptManNum=deptManNum+sysUserList.size();
+                        , SysUser::getCreateTime, countUserDto.getBeginTime(), countUserDto.getEndTime()));
+        if (sysUsers == null) return countUserVo;
+        countUserVo.setDeptSum(sysUsers.size());
+
+        List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
+        int deptManNum = 0;
+        for (String deptId : deptIds) {
+            List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                    .likeRight(SysUser::getId, deptId)
+                    .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+            deptManNum = deptManNum + sysUserList.size();
 
-            }
-            countUserVo.setDeptLeaderSum(deptManNum);
+        }
+        countUserVo.setDeptLeaderSum(deptManNum);
 
-            countUserVo.setCountSum(countUserVo.getDeptSum()+deptManNum);
+        countUserVo.setCountSum(countUserVo.getDeptSum() + deptManNum);
 
-        }
+        //曲线图
         List<CountUserNumVo> countUserNumVoList = null;
         int type = countUserDto.getType();
+        String s = startTime1.split(" ")[0];
+        String s1 = endTime1.split(" ")[0];
         if (type == 1) {
-            if (StringUtils.isNotEmpty(startTime1) && startTime1.split(" ")[0].equals(endTime1.split(" ")[0])) {
+            if (StringUtils.isNotEmpty(s) && s.equals(s1)) {
 
-                countUserNumVoList = sysPartnerMapper.queryDeptByTimes(userId,countUserDto);
-            }else {
-                countUserNumVoList = sysPartnerMapper.queryDeptByTime(userId,countUserDto);
+                countUserNumVoList = sysPartnerMapper.queryDeptByTimes(userId, countUserDto);
+            } else {
+                countUserNumVoList = sysPartnerMapper.queryDeptByTime(userId, countUserDto);
             }
-        }else {
-            List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
-            if (StringUtils.isNotEmpty(startTime1) && startTime1.split(" ")[0].equals(endTime1.split(" ")[0])){
+        } else {
+//            List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
+            if (StringUtils.isNotEmpty(s) && s.equals(s1)) {
 
-                countUserNumVoList = sysPartnerMapper.queryUserByTimes(deptIds,countUserDto);
-            }else {
-                countUserNumVoList = sysPartnerMapper.queryUserByTime(deptIds,countUserDto);
+                countUserNumVoList = sysPartnerMapper.queryUserByTimes(deptIds, countUserDto);
+            } else {
+                countUserNumVoList = sysPartnerMapper.queryUserByTime(deptIds, countUserDto);
             }
 
         }