|
|
@@ -289,6 +289,7 @@ public class BigLogic {
|
|
|
List<String> websitIds = adminUser.getAdminWebsitIds();
|
|
|
|
|
|
|
|
|
+ //后台登录用户
|
|
|
Integer loginComapnyNum = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
|
|
|
.eq(UserLog::getType, "LOGIN")
|
|
|
.in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
|
|
|
@@ -302,6 +303,7 @@ public class BigLogic {
|
|
|
.between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1))
|
|
|
.count();
|
|
|
|
|
|
+ //总工程师数量
|
|
|
Integer allWorker = websitUserService.lambdaQuery()
|
|
|
.in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds)
|
|
|
.groupBy(WebsitUser::getUserId)
|
|
|
@@ -318,10 +320,10 @@ public class BigLogic {
|
|
|
|
|
|
|
|
|
Integer allWorkerLogin = CollectionUtils.isEmpty(userIds)?0:websitUserService.lambdaQuery()
|
|
|
- .in(CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIds).count();
|
|
|
+ .in(!CollectionUtils.isEmpty(websitIds) ,WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIds).count();
|
|
|
|
|
|
|
|
|
- List<String> userIdBefores = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
|
|
|
+ List<String> userIdBefores = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
|
|
|
.eq(UserLog::getMiniType, UserTypeEnum.WORKER.getKey())
|
|
|
.eq(UserLog::getType, "LOGIN")
|
|
|
.in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
|
|
|
@@ -342,7 +344,7 @@ public class BigLogic {
|
|
|
.in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
|
|
|
.between(UserLog::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).count();
|
|
|
|
|
|
- Integer allServiceBefore = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
|
|
|
+ Integer allServiceBefore = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
|
|
|
.eq(UserLog::getMiniType, UserTypeEnum.SERVICE.getKey())
|
|
|
.eq(UserLog::getType, "LOGIN")
|
|
|
.in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
|
‘linchangsheng’