From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index 5ed1023..87cac8d 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,6 +4,14 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+<<<<<<< HEAD
+import doumeemes.core.utils.DateUtil;
+=======
+>>>>>>> 1.0.3
+import doumeemes.dao.ext.dto.ActivityLoginDTO;
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+import doumeemes.dao.ext.vo.ActivityLoginVO;
+import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.SystemUserMapper;
import doumeemes.dao.system.dto.QuerySystemUserDTO;
import doumeemes.dao.system.model.SystemUser;
@@ -16,11 +24,11 @@
import doumeemes.service.aware.DepartmentDataPermissionAware;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -188,4 +196,27 @@
injectIds(pool, child);
}
}
+
+
+
+ @Override
+ public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
+<<<<<<< HEAD
+ if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
+ activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
+ }
+=======
+>>>>>>> 1.0.3
+ return systemUserMapper.activityLoginVOList(activityLoginDTO);
+ }
+
+
+
+ @Override
+ public PageData<CompanyLoginStatisticsVO> companyLoginStatisticsPage(PageWrap<CompanyLoginDTO> pageWrap) {
+ // 鎵ц鏌ヨ
+ PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
+ List<CompanyLoginStatisticsVO> companyLoginStatisticsList = systemUserMapper.companyLoginStatisticsList(pageWrap.getModel());
+ return PageData.from(new PageInfo<>(companyLoginStatisticsList));
+ }
}
--
Gitblit v1.9.3