bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

 server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java

@@ -4,6 +4,11 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
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 +21,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 +193,24 @@
            injectIds(pool, child);
        }
    }



    @Override
    public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
        if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
            activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
        }
        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));
    }
}