From 0a32ecc49bc4acd885096562e809381d28b3d1d7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 14:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
index 2b2bbd5..ad0bc26 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
+++ b/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;
--
Gitblit v1.7.1