合伙人APP贡献费用计算离职人员

package-lock.json

@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}

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

@@ -1555,8 +1555,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
                     sumPremium = sumPremium.add(sysPremiumDetails1.get(0).getSumpremium());
                 }
-//                SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
-//                sumPremium = sumPremium.add(sysPremiumDetails1.getSumpremium());
                 BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
                 extractFee = extractFee.add(reduce);
             }
@@ -1564,7 +1562,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         }
         teamUserInfosFreeVo.setSumPremium(sumPremium);
         teamUserInfosFreeVo.setExtractFee(extractFee);
-        //在职员工
+        //所有员工包括离职的员工
         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                 .in(SysUser::getId, teamUserInfosDto.getUserIds()));
         for (SysUser sysUser : sysUsers) {
@@ -1601,6 +1599,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             teamUserInfosVo.setExtractFee(extractFee1);
             userInfosVoList.add(teamUserInfosVo);
         }
+        //正常人员数量
         List<SysUser> sysUsers1 = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                 .ne(SysUser::getStatus, 0).in(SysUser::getId, teamUserInfosDto.getUserIds()));
         teamUserInfosFreeVo.setTeamManNum(sysUsers1.size());