Merge remote-tracking branch 'origin/hehuoren' into hehuoren

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

@@ -113,7 +113,7 @@ public class SysAgencyLeaderController extends BaseController {
      * @return 新增结果
      */
     @PostMapping("/edit")
-    @ApiOperation(value = "编辑配置机构负责人的信息")
+    @ApiOperation(value = "修改比例配置")
     public HttpResult edit(@RequestBody SysAgencyLeaderDto sysAgencyLeaderDto) {
         return HttpResult.ok(this.sysAgencyLeaderService.edit(sysAgencyLeaderDto));
     }
@@ -121,7 +121,7 @@ public class SysAgencyLeaderController extends BaseController {
      * 批量修改配置
      */
     @PostMapping("/editAll")
-    @ApiOperation(value = "编辑配置机构负责人的信息")
+    @ApiOperation(value = "批量修改配置")
     public HttpResult editAll(@RequestBody List<SysAgencyLeaderDto> sysAgencyLeaderDto) {
         return HttpResult.ok(this.sysAgencyLeaderService.editAll(sysAgencyLeaderDto));
     }

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

@@ -0,0 +1,24 @@
+package com.ydtech.modules.admin.model.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ydtech.modules.admin.model.SysPartner;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class SysPartnerVo extends SysPartner {
+
+    @ApiModelProperty(value = "部门name")
+    private String deptName;
+
+    @ApiModelProperty(value = "机构name")
+    private String agencyName;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+
+}

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

@@ -47,8 +47,8 @@ public class SysUserPartner {
     @TableField(exist = false)
     @ApiModelProperty(value = "所属机构父ID")
     private String parentId;
-    @ApiModelProperty(value = "是否为合伙人： 1：是  0：否")
-    private String type;
+    @ApiModelProperty(value = "合伙人等级")
+    private Integer type;
 
 
 

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

@@ -60,5 +60,5 @@ public interface SysPartnerService extends IService<SysPartner> {
 
     PartnerLeaderInfoVo partnerLeaderInfo(PartnerGradeInfo partnerGradeInfo);
 
-    List<SysPartner> getRelationInfo(String userId);
+    List<SysPartnerVo> getRelationInfo(String userId);
 }

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

@@ -1100,6 +1100,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
     public SysAgencyLeaderDeptVo queryInfoById(Integer id) {
         SysAgencyLeaderDeptVo sysAgencyLeaderDeptVo = new SysAgencyLeaderDeptVo();
         SysAgencyLeader sysAgencyLeader = baseMapper.selectById(id);
+        SysUser sysUser = sysUserMapper.selectById(sysAgencyLeader.getSuggestId());
+        sysAgencyLeader.setSuggestName(sysUser.getSuggestName());
         sysAgencyLeaderDeptVo.setSysAgencyLeader(sysAgencyLeader);
 
         SysDept sysDept = sysDeptMapper.selectById(sysAgencyLeader.getDeptId());

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

@@ -33,6 +33,7 @@ import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 配置机构合伙人表(SysPartner)表服务实现类
@@ -184,7 +185,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                         .eq(SysPartner::getUserId, user.getId()));
                 if (sysPartner != null) {
-                    user.setType("1");
+                    user.setType(sysPartner.getType());
                     String suggestId = sysPartner.getSuggestId();
                     if (suggestId != null) {
                         user.setSuggestId(sysPartner.getSuggestId());
@@ -965,29 +966,30 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysRelationPerson::getSuggestId, userId)
                     .eq(SysRelationPerson::getDelFlag, 1)
                     .eq(SysRelationPerson::getType, 1));
+            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));
+                int deptManNum = 0;
+                if (leaderList.size() > 0) {
+                    for (SysAgencyLeader sysAgencyLeader : leaderList) {
+                        //获取机构下的团队
+                        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()));
+                        if (sysDeptList.size() > 0) {
+                            for (SysDept sysDept : sysDeptList) {
+                                List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                                        .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                deptManNum = deptManNum + sysUsers.size();
 
-            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));
-            int deptManNum = 0;
-            if (leaderList.size() > 0) {
-                for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                    //获取机构下的团队
-                    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()));
-                    if (sysDeptList.size() > 0) {
-                        for (SysDept sysDept : sysDeptList) {
-                            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                    .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
-                            deptManNum = deptManNum + sysUsers.size();
-
+                            }
                         }
                     }
-                }
 
-                appPartnerNumVo.setTeamManNum(deptManNum);
+                    appPartnerNumVo.setTeamManNum(deptManNum);
+                }
             }
         } else {
             int deptManNum = 0;
@@ -1029,17 +1031,22 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
             appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
             appUserInfoVo.setLevel(sysPartner.getType());
+        }else {
+            SysPartnerConfig sysPartnerConfig = sysPartnerConfigMapper.selectOne(new LambdaQueryWrapper<SysPartnerConfig>()
+                    .eq(SysPartnerConfig::getDelFlag, 1).eq(SysPartnerConfig::getLevel, 0));
+            appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
         }
+
         // 获取当前日期
-        LocalDate currentDate = LocalDate.now();
-        ZoneId zoneId = ZoneId.systemDefault();
-        Date entryTime = appUserInfoVo.getEntryTime();
-        if (entryTime != null) {
-            LocalDate localDate = entryTime.toInstant().atZone(zoneId).toLocalDate();
-            // 计算年数
-            long years = ChronoUnit.YEARS.between(localDate, currentDate);
-            appUserInfoVo.setYears(years);
-        }
+//        LocalDate currentDate = LocalDate.now();
+//        ZoneId zoneId = ZoneId.systemDefault();
+//        Date entryTime = appUserInfoVo.getEntryTime();
+//        if (entryTime != null) {
+//            LocalDate localDate = entryTime.toInstant().atZone(zoneId).toLocalDate();
+//            // 计算年数
+//            long years = ChronoUnit.YEARS.between(localDate, currentDate);
+//            appUserInfoVo.setYears(years);
+//        }
 
         return appUserInfoVo;
     }
@@ -1292,51 +1299,54 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 .eq(SysRelationPerson::getSource, 0)
                 .eq(SysRelationPerson::getType, 1));
         appSysPartnerVo.setWorkNumber(sysRelationPersons.size());
-        List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-        appSysPartnerVo.setLeaderIds(list1);
-        //直接工作室保费
-        List<SysPremiumDetails> sysPremiumDetails1 = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                .in(CollectionUtil.isNotEmpty(list1), SysPremiumDetails::getUserId, list1)
-                .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 != null) {
-
-            BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-            appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
-            appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
-        } else {
-            appSysPartnerVo.setSumPremium(sumPremium);
-            appSysPartnerVo.setExtractFee(extractFee);
-        }
-        int leaderManNum = 0;
-        //直接工作室总
-        List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                .in(CollectionUtil.isNotEmpty(list1), SysAgencyLeader::getUserId, list1).eq(SysAgencyLeader::getDelFlag, 1));
+        if (sysRelationPersons.size()>0) {
+
+            List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+            appSysPartnerVo.setLeaderIds(list1);
+            //直接工作室保费
+            List<SysPremiumDetails> sysPremiumDetails1 = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                    .in(CollectionUtil.isNotEmpty(list1), SysPremiumDetails::getUserId, list1)
+                    .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) {
+
+                BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+                BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
+                appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
+            } else {
+                appSysPartnerVo.setSumPremium(sumPremium);
+                appSysPartnerVo.setExtractFee(extractFee);
+            }
+            int leaderManNum = 0;
+            //直接工作室总
+            List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
+                    .in(CollectionUtil.isNotEmpty(list1), SysAgencyLeader::getUserId, list1).eq(SysAgencyLeader::getDelFlag, 1));
 
-        if (leaderList.size() > 0) {
-            for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                //获取机构下的团队
-                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()));
-                if (sysDeptList.size() > 0) {
-                    for (SysDept sysDept : sysDeptList) {
-                        List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
-                        leaderManNum = leaderManNum + sysUsers.size();
+            if (leaderList.size() > 0) {
+                for (SysAgencyLeader sysAgencyLeader : leaderList) {
+                    //获取机构下的团队
+                    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()));
+                    if (sysDeptList.size() > 0) {
+                        for (SysDept sysDept : sysDeptList) {
+                            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                                    .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                            leaderManNum = leaderManNum + sysUsers.size();
 
+                        }
                     }
                 }
             }
-        }
 
-        appSysPartnerVo.setTeamManNum(deptManNum + leaderManNum);
+            appSysPartnerVo.setTeamManNum(deptManNum + leaderManNum);
 
-        appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
+            appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
+        }
     }
 
     @Override
@@ -1798,41 +1808,68 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public List<SysPartner> getRelationInfo(String userId) {
-        List<SysPartner> sysPartners = new ArrayList<>();
+    public List<SysPartnerVo> getRelationInfo(String userId) {
+        List<SysPartnerVo> sysPartners = new ArrayList<>();
         //登陆人的上三级合伙人信息
         SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                 .eq(SysPartner::getUserId, userId).eq(SysPartner::getDelFlag, 1));
-        sysPartners.add(sysPartner);
+        SysPartnerVo sysPartnerVo = BeanUtil.copyProperties(sysPartner, SysPartnerVo.class);
+        sysPartners.add(sysPartnerVo);
         List<String> ids = new ArrayList<>();
         List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getAgencyLeaderId, userId).eq(SysRelationPerson::getType, 0));
+                .eq(SysRelationPerson::getAgencyLeaderId, userId).eq(SysRelationPerson::getType, 0).orderByDesc(SysRelationPerson::getId));
         if (sysRelationPersonList.size() > 0) {
             List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
-            if (collect.size() > 0) {
+
+            if (collect.size() >4) {
+                List<String> collect1 = collect.stream().limit(4).collect(Collectors.toList());
+                ids.addAll(collect1);
+            }else {
                 ids.addAll(collect);
+
             }
 
         }
 
-
         List<SysRelationPerson> sysRelationList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                 .eq(SysRelationPerson::getSuggestId, userId).eq(SysRelationPerson::getType, 0));
         if (sysRelationList.size() > 0) {
 
-            List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
-            if (CollectionUtil.isNotEmpty(collect1)) {
+            List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+            if (collect1.size()>4) {
+                List<String> collect2 = collect1.stream().limit(4).collect(Collectors.toList());
+                ids.addAll(collect2);
+            }else {
                 ids.addAll(collect1);
+
             }
         }
         if (CollectionUtil.isNotEmpty(ids)) {
             List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
                     .in(SysPartner::getUserId, ids).eq(SysPartner::getDelFlag, 1));
-            sysPartners.addAll(sysPartnerList);
+            List<SysPartnerVo> sysPartnerVos = BeanUtil.copyToList(sysPartnerList, SysPartnerVo.class);
+            sysPartners.addAll(sysPartnerVos);
+        }
+        List<SysPartnerVo> sysPartnerVoList = sysPartners.stream().sorted(Comparator.comparing(SysPartner::getId)).collect(Collectors.toList());
+        if (sysPartnerVoList.size()>0) {
+            for (SysPartnerVo partner : sysPartnerVoList) {
+                SysUser sysUser1 = sysUserMapper.selectById(partner.getUserId());
+                partner.setMobile(sysUser1.getMobile());
+                SysDept sysDept = sysDeptMapper.selectById(sysUser1.getDeptId());
+                partner.setDeptName(sysDept.getName());
+                SysDept sysDept1 = sysDeptMapper.selectById(sysDept.getParentId());
+                partner.setAgencyName(sysDept1.getName());
+
+                String suggestId = partner.getSuggestId();
+                if (StringUtils.isNotEmpty(suggestId)) {
+                    SysUser sysUser = sysUserMapper.selectById(partner.getSuggestId());
+                    partner.setSuggestName(sysUser.getName());
+
+                }
+            }
         }
-        List<SysPartner> list = sysPartners.stream().sorted(Comparator.comparing(SysPartner::getId)).collect(Collectors.toList());
 
-        return list;
+        return sysPartnerVoList;
     }