From 071782e764516c6c63c9c4fceb8fafe3fc546444 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 17:54:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 13 ++++++++++---
src/main/java/com/nq/vo/position/AgentPositionVO.java | 7 ++++++-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index a5fbb8a..a1000fa 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -683,7 +683,7 @@
end_time = DateTimeUtil.searchStrToTimestamp(endTime);
}
- PageHelper.startPage(pageNum, pageSize);
+
List<Integer> ids = new ArrayList<>();
@@ -691,7 +691,7 @@
ids = getSubordinates(searchId);
ids.add(searchId);
}
-
+ PageHelper.startPage(pageNum, pageSize);
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
userId, ids, positionSn, begin_time, end_time,null);
@@ -1134,7 +1134,14 @@
private AgentPositionVO assembleAgentPositionVO(UserPosition position) {
AgentPositionVO agentPositionVO = new AgentPositionVO();
-
+ User user = userMapper.selectById(position.getUserId());
+ if(null != user){
+ AgentUser agentUser = agentUserMapper.selectById(user.getAgentId());
+ agentPositionVO.setPhone(user.getPhone());
+ if(null != agentUser){
+ agentPositionVO.setAgentName(agentUser.getAgentName());
+ }
+ }
agentPositionVO.setId(position.getId());
agentPositionVO.setPositionSn(position.getPositionSn());
agentPositionVO.setPositionType(position.getPositionType());
diff --git a/src/main/java/com/nq/vo/position/AgentPositionVO.java b/src/main/java/com/nq/vo/position/AgentPositionVO.java
index f2f6ac0..f57e275 100644
--- a/src/main/java/com/nq/vo/position/AgentPositionVO.java
+++ b/src/main/java/com/nq/vo/position/AgentPositionVO.java
@@ -1,8 +1,11 @@
package com.nq.vo.position;
+import lombok.Data;
+import sun.management.resources.agent;
+
import java.math.BigDecimal;
import java.util.Date;
-
+@Data
public class AgentPositionVO {
private Integer id;
private Integer positionType;
@@ -52,6 +55,8 @@
private Integer isLock;
private String lockMsg;
private String stockPlate;
+ private String agentName;
+ private String phone;
public void setPositionType(Integer positionType) {
this.positionType = positionType;
--
Gitblit v1.9.3