工作室新增人员统计

src/main/java/com/ydtech/modules/admin/model/vo/CountUserVo.java

@@ -8,7 +8,7 @@ import java.util.List;
 @Data
 public class CountUserVo {
 
-    @ApiModelProperty(value = "总的前线人数")
+    @ApiModelProperty(value = "新增人员")
     private Integer countSum;
     @ApiModelProperty(value = "团队数")
     private Integer deptSum;

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

@@ -1578,7 +1578,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         //查工作室下的团队
         SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
                 .eq(SysAgencyLeader::getDelFlag, 1).in(SysAgencyLeader::getUserId, userId));
-
+        List<SysUser> userList =new ArrayList<>();
         //根据机构id查下面团队
         List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                 .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
@@ -1592,13 +1592,47 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                         .likeRight(SysUser::getId, sysDept.getId())
                         .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+                userList.addAll(sysUserList);
                 deptManSum = deptManSum + sysUserList.size();
             }
 
             countUserVo.setDeptSum(deptSum);
             countUserVo.setDeptManSum(deptManSum);
+            List<SysUser> collect;
+            if (CollectionUtil.isNotEmpty(userList)) {
+                try {
+                    if (StringUtils.isNotEmpty(startTime1)) {
+                        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+                        Date parse = simpleDateFormat1.parse(startTime1);
+                        Date parse1 = simpleDateFormat1.parse(endTime1);
+
+                        collect = userList.stream().filter(SysUser -> SysUser.getCreateTime().after(parse)
+                                && SysUser.getCreateTime().before(parse1)).collect(Collectors.toList());
+
+                    }else {
+                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = new Date();
+                        String format = simpleDateFormat.format(date);
+                        String start = format + " 00:00:01";
+                        String end = format + " 23:59:59";
+                        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+                        Date parse = simpleDateFormat1.parse(start);
+                        Date parse1 = simpleDateFormat1.parse(end);
+
+                        collect = userList.stream().filter(SysUser -> SysUser.getCreateTime().after(parse)
+                                && SysUser.getCreateTime().before(parse1)).collect(Collectors.toList());
+                    }
+
+                    countUserVo.setCountSum(collect.size());
 
-            countUserVo.setCountSum(deptSum + deptManSum);
+                }catch (Exception e){
+                    throw new SystemException("系统繁忙,请联系管理员");
+                }
+            }else {
+                countUserVo.setCountSum(0);
+            }
 
             //曲线图
             List<CountUserNumVo> countUserNumVoList = null;