From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +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 | 22 ++++++++++++++++++++++
1 files changed, 22 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 472d616..29d8c4a 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
@@ -64,6 +64,28 @@
pageInfo.setRecords(list);
return pageInfo;
}
+ @Override
+ public PageInfo<TAccountingStrategyVO> pageList1(TAccountingStrategyQuery query) {
+ PageInfo<TAccountingStrategyVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
+ List<TAccountingStrategyVO> list = this.baseMapper.pageList1(query,pageInfo);
+ List<Integer> parentIds = list.stream().map(TAccountingStrategyVO::getId).collect(Collectors.toList());
+
+ for (TAccountingStrategyVO tAccountingStrategyVO : list) {
+ SysUser data = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();
+ tAccountingStrategyVO.setUserName(data.getNickName());
+ if (tAccountingStrategyVO.getFirstUserId()!=null){
+ SysUser first = sysUserClient.getSysUser(tAccountingStrategyVO.getFirstUserId()).getData();
+ tAccountingStrategyVO.setFirstUserName(first==null?null:first.getNickName());
+ }
+ if (tAccountingStrategyVO.getTwoUserId()!=null){
+ SysUser two = sysUserClient.getSysUser(tAccountingStrategyVO.getTwoUserId()).getData();
+ tAccountingStrategyVO.setTwoUserName(two==null?null:two.getNickName());
+ }
+
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
/**
--
Gitblit v1.7.1