From c94f3c34d1c2c5a1d5e7010ab1e3cd0aded3cfac Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期二, 15 八月 2023 09:40:37 +0800
Subject: [PATCH] Merge branch 'zya'

---
 src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
index 5cdcabc..674ae10 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
@@ -75,6 +75,86 @@
     }
 
     @Override
+    public void selectCompanyUserDataGrid(PageInfo pageInfo) {
+        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
+        List<OrderItem> orderItems = new ArrayList<>();
+        OrderItem orderItem = new OrderItem();
+        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
+            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
+            orderItem.setColumn(pageInfo.getSort());
+        }else {
+            orderItem.setAsc(false);
+            orderItem.setColumn("createddate");
+        }
+        orderItems.add(orderItem);
+        page.setOrders(orderItems);
+        List<UserVo> list = userInfoMapper.selectCompanyUserDataList(page,pageInfo.getCondition());
+        for (UserVo userVo : list) {
+            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
+            userVo.setRoles(roleInfoList);
+            UserFace userFace = userFaceService.selectByUserId(userVo.getId());
+            if (userFace != null)
+                userVo.setCode(userFace.getCode());
+        }
+        pageInfo.setResult(list);
+        pageInfo.setTotalCount(page.getTotal());
+    }
+    @Override
+    public void selectSuperviseUserDataGrid(PageInfo pageInfo) {
+        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
+        List<OrderItem> orderItems = new ArrayList<>();
+        OrderItem orderItem = new OrderItem();
+        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
+            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
+            orderItem.setColumn(pageInfo.getSort());
+        }else {
+            orderItem.setAsc(false);
+            orderItem.setColumn("createddate");
+        }
+        orderItems.add(orderItem);
+        page.setOrders(orderItems);
+        List<UserVo> list = userInfoMapper.selectSuperviseUserDataList(page,pageInfo.getCondition());
+        for (UserVo userVo : list) {
+            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
+            userVo.setRoles(roleInfoList);
+            UserFace userFace = userFaceService.selectByUserId(userVo.getId());
+            if (userFace != null)
+                userVo.setCode(userFace.getCode());
+        }
+        pageInfo.setResult(list);
+        pageInfo.setTotalCount(page.getTotal());
+    }
+    @Override
+    public void selectExpertUserDataGrid(PageInfo pageInfo) {
+        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
+        List<OrderItem> orderItems = new ArrayList<>();
+        OrderItem orderItem = new OrderItem();
+        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
+            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
+            orderItem.setColumn(pageInfo.getSort());
+        }else {
+            orderItem.setAsc(false);
+            orderItem.setColumn("createddate");
+        }
+        orderItems.add(orderItem);
+        page.setOrders(orderItems);
+        List<UserVo> list = userInfoMapper.selectExpertUserDataList(page,pageInfo.getCondition());
+        for (UserVo userVo : list) {
+            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
+            userVo.setRoles(roleInfoList);
+
+        }
+        pageInfo.setResult(list);
+        pageInfo.setTotalCount(page.getTotal());
+    }
+
+    @Override
+    public List<UserInfo> selectExpertList(String realname) {
+        List<UserInfo> userInfos = userInfoMapper.selectExpertList(realname);
+        return userInfos;
+    }
+
+    @Override
     public UserInfo selectByUser(String username) {
         UserInfo userInfo = new UserInfo();
         userInfo.setUsername(username);
@@ -100,6 +180,10 @@
     @Override
     public UserVo selectUserVoByName(String examtype,String username) {
         return userInfoMapper.selectUserVoByName(examtype,username);
+    }
+    @Override
+    public UserVo selectUserVoById(Long userId) {
+        return userInfoMapper.selectUserVoById(userId);
     }
 
 
@@ -438,4 +522,8 @@
     public UserInfo getByUserId(Long userId) {
         return userInfoMapper.getByUserId(userId);
     }
+
+
+
+
 }

--
Gitblit v1.9.2