From d88e87c9c0aabb1f82e20193cd9eafcaa5cb7028 Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Wed, 24 Jul 2024 09:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectBudgetImplementController.java     | 27 +++++++++++++++++++
 .../xqopen/kehui/util/ResultListReqUtil.java  |  6 +++++
 2 files changed, 33 insertions(+)

diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java
index 6d4fa41..ac87bb5 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java
@@ -4,6 +4,10 @@ import com.alibaba.fastjson.support.spring.FastJsonJsonView;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.xqopen.kehui.Api;
+import com.xqopen.kehui.common.entity.SystemUserLogin;
+import com.xqopen.kehui.common.entity.SystemUserRole;
+import com.xqopen.kehui.common.service.ISystemUserLoginService;
+import com.xqopen.kehui.common.service.ISystemUserRoleService;
 import com.xqopen.kehui.exception.ErrorCode;
 import com.xqopen.kehui.exception.XQException;
 import com.xqopen.kehui.project.api.ProjectBudgetImplementApi;
@@ -22,6 +26,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -32,6 +37,10 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
     private IProjectBudgetImplementService projectBudgetImplementService;
     @Autowired
     private IProjectInfoService projectInfoService;
+    @Autowired
+    private ISystemUserRoleService systemUserRoleService;
+    @Autowired
+    private ISystemUserLoginService systemUserLoginService;
 
     @PostMapping(Api.PROJECT_WEEKLY_BUDGET)
     @Override
@@ -47,8 +56,26 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
                     implementAddDto.setImplementationRate(String.format("%.2f%%",rate));
                 }
             }
+            //向listReq中加入财务专员id
+            EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();
+            Long roleId = 943384938727391233L;
+            userRole.eq("role_id",roleId);
+            userRole.eq("is_deleted",false);
+            List<SystemUserRole> systemUserRoles = systemUserRoleService.selectList(userRole);
+            List<String> roleUserId = new ArrayList<>();
+            for (SystemUserRole role : systemUserRoles) {
+                 Long UserId = role.getUserId();
+                 roleUserId.add(UserId.toString());
+            }
+            // 将userid存入listReq中
+            EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
+            userLoginEntityWrapper.eq("id_",userId);
+            SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
+
             ResultListReqUtil listReq = new ResultListReqUtil();
             listReq.setLs(list);
+            listReq.setRoleUserId(roleUserId);
+            listReq.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
             listReq.setTotal(page.getTotal());
             listReq.setPages(page.getPages());
             return ApiResponse.fillSuccess(listReq);
diff --git a/src/main/java/com/xqopen/kehui/util/ResultListReqUtil.java b/src/main/java/com/xqopen/kehui/util/ResultListReqUtil.java
index 75e5fa9..58497ec 100644
--- a/src/main/java/com/xqopen/kehui/util/ResultListReqUtil.java
+++ b/src/main/java/com/xqopen/kehui/util/ResultListReqUtil.java
@@ -9,6 +9,12 @@ public class ResultListReqUtil<T>{
     @ApiModelProperty(value = "项目列表", required = true, position = 3)
     private List<T> ls;
 
+    @ApiModelProperty(value = "财务专员id", required = true, position = 3)
+    private List<T> roleUserId;
+
+    @ApiModelProperty(value = "userId", required = true, position = 3)
+    private String userId;
+
     @ApiModelProperty(value = "总记录数", required = true, position = 3)
     private long total;