From 1a75f5c8b37b93dfce7f8702d3e42ffb2c530f23 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 11 Feb 2022 10:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E3=80=90statistics?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E5=8F=98=E9=87=8F=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scanner-spring-boot-starter/pom.xml          |  6 ++++++
 .../system/api/pojo/home/HomeCompanyInfo.java    | 16 ++++++++--------
 .../home/service/Impl/HomePageServiceImpl.java   |  7 ++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
index 261f228cc..997dc4d12 100644
--- a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
+++ b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml
@@ -24,6 +24,12 @@
             <version>${roses.version}</version>
         </dependency>
 
+        <!--properties自动提示装载-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
index ef9845213..8dcaf41d1 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
@@ -12,27 +12,27 @@ import lombok.Data;
 public class HomeCompanyInfo {
 
     /**
-     * 组织机构数
+     * 所有组织机构数
      */
     private Integer organizationNum;
 
     /**
-     * 企业人员总数
+     * 所有企业人员总数
      */
-    private Integer enterprisePersonnelNum;
+    private Integer enterprisePersonNum;
 
     /**
-     * 职位总数
+     * 所有职位总数
      */
     private Integer positionNum;
 
     /**
-     * 部门总数
+     * 当前登录用户，所在公司的部门数量
      */
-    private Integer sectionNum;
+    private Integer currentDeptNum;
 
     /**
-     * 公司人员总数
+     * 当前登录用户，所在公司的总人数
      */
-    private Integer companyPersonnelNum;
+    private Integer currentCompanyPersonNum;
 }
diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
index 59c47b352..e256ffcdf 100644
--- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
+++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
@@ -108,7 +108,7 @@ public class HomePageServiceImpl extends ServiceImpl<InterfaceStatisticsMapper,
         // 获取企业人员总数
         SysUserRequest sysUserRequest = new SysUserRequest();
         List<Long> allUserIdList = userServiceApi.queryAllUserIdList(sysUserRequest);
-        homeCompanyInfo.setEnterprisePersonnelNum(allUserIdList.size());
+        homeCompanyInfo.setEnterprisePersonNum(allUserIdList.size());
 
         // 获取职位总数
         int positionNum = positionServiceApi.PositionNum();
@@ -116,10 +116,11 @@ public class HomePageServiceImpl extends ServiceImpl<InterfaceStatisticsMapper,
 
         // 获取当前登录用户
         LoginUser loginUser = LoginContext.me().getLoginUser();
+
         // 获取组织公司ID
         Long organizationId = loginUser.getOrganizationId();
         List<SysUserOrg> sysUserOrgs = sysUserOrgService.list(Wrappers.<SysUserOrg>lambdaQuery().eq(SysUserOrg::getOrgId, organizationId));
-        homeCompanyInfo.setCompanyPersonnelNum(sysUserOrgs.size());
+        homeCompanyInfo.setCurrentCompanyPersonNum(sysUserOrgs.size());
 
         // 设置公司部门数
         int sectionNum = 0;
@@ -131,7 +132,7 @@ public class HomePageServiceImpl extends ServiceImpl<InterfaceStatisticsMapper,
                 }
             }
         }
-        homeCompanyInfo.setSectionNum(sectionNum);
+        homeCompanyInfo.setCurrentDeptNum(sectionNum);
 
         return homeCompanyInfo;
     }