合伙人统计时间筛选

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

@@ -2047,7 +2047,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 .eq(SysRelationPerson::getSuggestId, userId)
                 .eq(SysRelationPerson::getDelFlag, 1)
                 .eq(SysRelationPerson::getSource, 0)
-                .eq(SysRelationPerson::getType, 1));
+                .eq(SysRelationPerson::getType, 1)
+                .between(StringUtils.isNotEmpty(partnerCountDto.getBeginTime()) && StringUtils.isNotEmpty(partnerCountDto.getEndTime())
+                        , SysRelationPerson::getCreateTime,partnerCountDto.getBeginTime(),partnerCountDto.getEndTime()));
         partnerCountVo.setWorkSum(sysRelationPersonList.size());
         if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
             List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
@@ -2062,14 +2064,18 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                         .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
                         .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
-                        .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
+                        .eq(SysDept::getManagementSource, sysAgencyLeader.getSource())
+                        .between(StringUtils.isNotEmpty(partnerCountDto.getBeginTime()) && StringUtils.isNotEmpty(partnerCountDto.getEndTime())
+                                , SysDept::getCreateTime,partnerCountDto.getBeginTime(),partnerCountDto.getEndTime()));
                 deptSum = deptSum + sysDeptList.size();
                 if (sysDeptList.size() > 0) {
                     for (SysDept sysDept : sysDeptList) {
                         //团队下的人数
                         List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                                 .likeRight(SysUser::getId, sysDept.getId())
-                                .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+                                .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7))
+                                .between(StringUtils.isNotEmpty(partnerCountDto.getBeginTime()) && StringUtils.isNotEmpty(partnerCountDto.getEndTime())
+                                        , SysUser::getCreateTime,partnerCountDto.getBeginTime(),partnerCountDto.getEndTime()));
                         deptManSum = deptManSum + sysUserList.size();
                     }
                 }