明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhibing.pu
2024-09-04 0a32ecc49bc4acd885096562e809381d28b3d1d7 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java


@@ -1,5 +1,6 @@


package com.ruoyi.chargingPile.service.impl;




import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.chargingPile.api.model.TAccountingStrategy;


import com.ruoyi.chargingPile.api.query.TAccountingStrategyQuery;


@@ -12,9 +13,13 @@


import com.ruoyi.system.api.domain.SysUser;


import com.ruoyi.system.api.feignClient.SysUserClient;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;




import javax.annotation.Resource;


import java.util.Arrays;


import java.util.Comparator;


import java.util.List;


import java.util.stream.Collectors;




/**


 * <p>


@@ -33,6 +38,10 @@


    public PageInfo<TAccountingStrategyVO> pageList(TAccountingStrategyQuery query) {


        PageInfo<TAccountingStrategyVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());


        List<TAccountingStrategyVO> list = this.baseMapper.pageList(query,pageInfo);


        List<Integer> parentIds = list.stream().map(TAccountingStrategyVO::getId).collect(Collectors.toList());


        List<TAccountingStrategy> list1 = this.list(Wrappers.lambdaQuery(TAccountingStrategy.class)


                .in(TAccountingStrategy::getParentId, parentIds)


                .in(TAccountingStrategy::getAuditStatus, Arrays.asList(1,2)));


        for (TAccountingStrategyVO tAccountingStrategyVO : list) {


            SysUser data = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();


            tAccountingStrategyVO.setUserName(data.getNickName());


@@ -44,6 +53,13 @@


                SysUser two = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();


                tAccountingStrategyVO.setTwoUserName(two==null?null:two.getNickName());


            }


            // 匹配编辑后的未审核的


            List<TAccountingStrategy> accountingStrategies = list1.stream().filter(e -> e.getParentId().equals(tAccountingStrategyVO.getId()))


                    .sorted(Comparator.comparing(TAccountingStrategy::getCreateTime).reversed()).collect(Collectors.toList());


            if(!CollectionUtils.isEmpty(accountingStrategies)){


                TAccountingStrategy tAccountingStrategy = accountingStrategies.get(0);


                tAccountingStrategyVO.setAuditStatus(tAccountingStrategy.getAuditStatus());


            }


        }


        pageInfo.setRecords(list);


        return pageInfo;