From 4b8e9025dd37f09f8bdbe1e5822faea8f25c8064 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 13 七月 2023 12:53:21 +0800
Subject: [PATCH] 优化报表误差

---
 service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
index f3a73d9..ebafce2 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java
@@ -18,8 +18,8 @@
 
 import com.java110.user.dao.IPrivilegeUserV1ServiceDao;
 import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
-import com.java110.dto.privilegeUser.PrivilegeUserDto;
-import com.java110.po.privilegeUser.PrivilegeUserPo;
+import com.java110.dto.privilege.PrivilegeUserDto;
+import com.java110.po.privilege.PrivilegeUserPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.user.UserDto;
@@ -28,7 +28,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -86,4 +85,44 @@
     public int queryPrivilegeUsersCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
         return privilegeUserV1ServiceDaoImpl.queryPrivilegeUsersCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));    }
 
+    @Override
+    public int queryPrivilegeUserInfoCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        return privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfoCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));
+    }
+
+    @Override
+    public List<UserDto> queryPrivilegeUserInfos(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        int page = privilegeUserDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            privilegeUserDto.setPage((page - 1) * privilegeUserDto.getRow());
+        }
+
+        List<UserDto> privilegeUsers = BeanConvertUtil.covertBeanList(privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfos(BeanConvertUtil.beanCovertMap(privilegeUserDto)), UserDto.class);
+
+        return privilegeUsers;
+    }
+
+    @Override
+    public int queryStaffsNoRoleCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        return privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));
+    }
+
+    @Override
+    public List<UserDto> queryStaffsNoRoleInfos(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        int page = privilegeUserDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            privilegeUserDto.setPage((page - 1) * privilegeUserDto.getRow());
+        }
+
+        List<UserDto> privilegeUsers = BeanConvertUtil.covertBeanList(privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleInfos(BeanConvertUtil.beanCovertMap(privilegeUserDto)), UserDto.class);
+
+        return privilegeUsers;
+    }
+
 }

--
Gitblit v1.8.0