明细

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

@@ -1340,69 +1340,68 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
         Page<SysPremiumDetails> page = new Page<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize());
 
-        LambdaQueryWrapper<SysPremiumDetails> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysPremiumDetails::getUserId, userId);
-        wrapper.eq(commissionInfoDto.getIndustrySector() != 0, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector());
-        wrapper.between(StringUtils.isNotEmpty(commissionInfoDto.getBeginTime()) && StringUtils.isNotEmpty(commissionInfoDto.getEndTime()),
-                SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime());
-        wrapper.orderByDesc(SysPremiumDetails::getId);
-
-        Page<SysPremiumDetails> insOrdersPage = sysPremiumDetailsService.page(page, wrapper);
-        List<SysPremiumDetails> sysPremiumDetails = insOrdersPage.getRecords();
-        if (CollectionUtil.isNotEmpty(sysPremiumDetails)) {
-            Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
-                    .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
-            for (String key : listMap.keySet()) {
-                List<SysPremiumInfoVo> proportionList = new ArrayList<>();
-                SysPremiumDetailsVo sysPremiumDetailsVo = new SysPremiumDetailsVo();
-                sysPremiumDetailsVo.setCompanyId(key);
-                List<SysPremiumDetails> detailsList = listMap.get(key);
-
-                BigDecimal extractFee = detailsList.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                sysPremiumDetailsVo.setExtractFee(extractFee);
-                SysPremiumDetails sysPremiumDetails1 = detailsList.get(0);
-                String issuerId = sysPremiumDetails1.getIssuerId();
-                if (issuerId != null) {
-                    SysUser sysUser1 = sysUserMapper.selectById(issuerId);
-                    SysDept sysDept = sysDeptMapper.selectById(sysUser1.getDeptId());
-                    SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
-                            .eq(SysAgencyLeader::getDelFlag, 1).eq(SysAgencyLeader::getDeptId, sysDept.getParentId()));
-                    SysRelationPerson sysRelationPerson = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
-                            .eq(SysRelationPerson::getAgencyLeaderId,sysAgencyLeader.getUserId())
-                            .eq(SysRelationPerson::getSource,0).eq(SysRelationPerson::getType,1));
-
-                    SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-                            .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysRelationPerson.getSuggestId()));
-                    sysPremiumDetailsVo.setProfferLevel(sysPartner.getType());
-                    SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
-                    sysPremiumDetailsVo.setProfferName(sysUser.getName());
-                }
-                sysPremiumDetailsVo.setSumpremium(sysPremiumDetails1.getSumpremium());
-                SysUser sysUser = sysUserMapper.selectById(sysPremiumDetails1.getIssuerId());
-                sysPremiumDetailsVo.setIssuerName(sysUser.getName());
-                sysPremiumDetailsVo.setIssuerId(sysPremiumDetails1.getIssuerId());
-                sysPremiumDetailsVo.setCreateTime(sysPremiumDetails1.getCreateTime());
-                sysPremiumDetailsVo.setLicenseno(sysPremiumDetails1.getLicenseno());
-                sysPremiumDetailsVo.setIndustrySector(sysPremiumDetails1.getIndustrySector());
-                sysPremiumDetailsVo.setStatus(sysPremiumDetails1.getStatus());
-
-                for (SysPremiumDetails premiumDetails : detailsList) {
-                    SysPremiumInfoVo sysPremiumInfoVo = new SysPremiumInfoVo();
-                    sysPremiumInfoVo.setSource(premiumDetails.getSource());
-                    sysPremiumInfoVo.setSumpremium(premiumDetails.getSumpremium());
-                    sysPremiumInfoVo.setProportional(premiumDetails.getProportional());
-                    sysPremiumInfoVo.setExtractFee(premiumDetails.getExtractFee());
-                    proportionList.add(sysPremiumInfoVo);
-                }
-                proportionList = proportionList.stream().sorted(Comparator.comparingInt(SysPremiumInfoVo::getSource)).collect(Collectors.toList());
-                sysPremiumDetailsVo.setProfferList(proportionList);
+        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                .eq(SysPremiumDetails::getUserId, userId)
+                .eq(commissionInfoDto.getIndustrySector() != 0, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector())
+                .between(StringUtils.isNotEmpty(commissionInfoDto.getBeginTime()) && StringUtils.isNotEmpty(commissionInfoDto.getEndTime()),
+                        SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime())
+                .orderByDesc(SysPremiumDetails::getId).eq(SysPremiumDetails::getStatus,1));
+        if (CollectionUtil.isEmpty(sysPremiumDetails)) return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), 0L, 0L,
+                list);
+        Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+        for (String key : listMap.keySet()) {
+            List<SysPremiumInfoVo> proportionList = new ArrayList<>();
+            SysPremiumDetailsVo sysPremiumDetailsVo = new SysPremiumDetailsVo();
+            sysPremiumDetailsVo.setCompanyId(key);
+            List<SysPremiumDetails> detailsList = listMap.get(key);
+
+            BigDecimal extractFee = detailsList.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+            sysPremiumDetailsVo.setExtractFee(extractFee);
+            SysPremiumDetails sysPremiumDetails1 = detailsList.get(0);
+            String issuerId = sysPremiumDetails1.getIssuerId();
+            if (issuerId != null) {
+                SysUser sysUser1 = sysUserMapper.selectById(issuerId);
+                SysDept sysDept = sysDeptMapper.selectById(sysUser1.getDeptId());
+                SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
+                        .eq(SysAgencyLeader::getDelFlag, 1).eq(SysAgencyLeader::getDeptId, sysDept.getParentId()));
+                SysRelationPerson sysRelationPerson = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getAgencyLeaderId,sysAgencyLeader.getUserId())
+                        .eq(SysRelationPerson::getSource,0).eq(SysRelationPerson::getType,1));
+
+                SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
+                        .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysRelationPerson.getSuggestId()));
+                sysPremiumDetailsVo.setProfferLevel(sysPartner.getType());
+                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
+                sysPremiumDetailsVo.setProfferName(sysUser.getName());
+            }
+            sysPremiumDetailsVo.setSumpremium(sysPremiumDetails1.getSumpremium());
+            SysUser sysUser = sysUserMapper.selectById(sysPremiumDetails1.getIssuerId());
+            sysPremiumDetailsVo.setIssuerName(sysUser.getName());
+            sysPremiumDetailsVo.setIssuerId(sysPremiumDetails1.getIssuerId());
+            sysPremiumDetailsVo.setCreateTime(sysPremiumDetails1.getCreateTime());
+            sysPremiumDetailsVo.setLicenseno(sysPremiumDetails1.getLicenseno());
+            sysPremiumDetailsVo.setIndustrySector(sysPremiumDetails1.getIndustrySector());
+            sysPremiumDetailsVo.setStatus(sysPremiumDetails1.getStatus());
 
-                list.add(sysPremiumDetailsVo);
+            for (SysPremiumDetails premiumDetails : detailsList) {
+                SysPremiumInfoVo sysPremiumInfoVo = new SysPremiumInfoVo();
+                sysPremiumInfoVo.setSource(premiumDetails.getSource());
+                sysPremiumInfoVo.setSumpremium(premiumDetails.getSumpremium());
+                sysPremiumInfoVo.setProportional(premiumDetails.getProportional());
+                sysPremiumInfoVo.setExtractFee(premiumDetails.getExtractFee());
+                proportionList.add(sysPremiumInfoVo);
             }
+            proportionList = proportionList.stream().sorted(Comparator.comparingInt(SysPremiumInfoVo::getSource)).collect(Collectors.toList());
+            sysPremiumDetailsVo.setProfferList(proportionList);
+
+            list.add(sysPremiumDetailsVo);
         }
 
-        return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-                list);
+        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
+        long l = list.size() / page.getSize();
+        return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), list.size(), l,
+                collect);
     }
 
     @Override