gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.6】【statistics】更新变量名字

pull/26/MERGE
fengshuonan 2022-02-11 10:32:30 +08:00
parent 3b8075093d
commit 1a75f5c8b3
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-d-scanner/scanner-spring-boot-starter/pom.xml
View File

@ -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>

16
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/home/HomeCompanyInfo.java
View File

@ -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;
}

7
kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java
View File

@ -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;
}