合伙人Pc编辑

src/main/java/com/ydtech/modules/admin/controller/APPPartnerController.java

@@ -144,6 +144,15 @@ public class APPPartnerController extends BaseController {
 
         return HttpResult.ok(this.sysPartnerService.getCommissionInfo(commissionInfoDto));
     }
+    /**
+     *  新增人员统计
+     */
+    @PostMapping("/getCountUser")
+    @ApiOperation(value = "总佣金组成明细")
+    public HttpResult getCountUser(@RequestBody CountUserDto countUserDto) {
+
+        return HttpResult.ok(this.sysPartnerService.getCountUser(countUserDto));
+    }
 
 
 }

src/main/java/com/ydtech/modules/admin/model/dto/CountUserDto.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.admin.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CountUserDto {
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+}

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

@@ -0,0 +1,16 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CountUserVo {
+
+    @ApiModelProperty(value = "总的前线人数")
+    private Integer countSum;
+    @ApiModelProperty(value = "团队数")
+    private Integer deptSum;
+    @ApiModelProperty(value = "团队长数")
+    private Integer deptLeaderSum;
+
+}

src/main/java/com/ydtech/modules/admin/service/SysPartnerService.java

@@ -61,4 +61,6 @@ public interface SysPartnerService extends IService<SysPartner> {
     PartnerLeaderInfoVo partnerLeaderInfo(PartnerGradeInfo partnerGradeInfo);
 
     List<SysPartnerVo> getRelationInfo(String userId);
+
+    CountUserVo getCountUser(CountUserDto countUserDto);
 }

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

@@ -179,6 +179,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
         if (sysUserPartners.size() > 0) {
             for (SysUserPartner user : sysUserPartners) {
+                SysUser sysUser1 = sysUserMapper.selectById(user.getId());
+                user.setName(sysUser1.getName());
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, user.getDeptId()).eq(SysDept::getDelFlag, 0));
                 user.setParentId(sysDept.getParentId());
                 user.setDeptName(sysDept.getName());
@@ -1878,5 +1880,39 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         return sysPartnerVoList;
     }
 
+    @Override
+    public CountUserVo getCountUser(CountUserDto countUserDto) {
+        CountUserVo countUserVo = new CountUserVo();
+        String userId = BaseController.getUserId();
+
+        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))
+                .between(StringUtils.isNotEmpty(countUserDto.getBeginTime()) && StringUtils.isNotEmpty(countUserDto.getEndTime())
+                        ,SysUser::getCreateTime,countUserDto.getBeginTime(),countUserDto.getEndTime()));
+        if (sysUsers == null) {
+
+            countUserVo.setDeptSum(sysUsers.size());
+            countUserVo.setDeptLeaderSum(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.setCountSum(deptManNum);
+
+        }
+
+
+        return countUserVo;
+    }
+
 
 }