|
|
@@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
+import com.ydtech.core.page.PageRequest;
|
|
|
import com.ydtech.core.page.PageResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
|
import com.ydtech.modules.admin.model.*;
|
|
|
+import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUser2Vo;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
|
|
|
@@ -33,8 +35,12 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.temporal.TemporalAdjusters;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
|
|
|
@Service
|
|
|
@@ -79,6 +85,49 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
return sysUserMapper.findUserList(page, sysUserVO);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public IPage<QuTeamNum> quTeamNum(QuTeamNumDto quTeamNumDto) {
|
|
|
+ //判断必传标识是否为空
|
|
|
+ if (quTeamNumDto.getTeamOrUserFlag() != null) {
|
|
|
+ //判断是要查询用户还是团队
|
|
|
+ if ("1".equals(quTeamNumDto.getTeamOrUserFlag())) {
|
|
|
+ PageRequest pageRequest = new PageRequest();
|
|
|
+ pageRequest.setPageNum(quTeamNumDto.getPageNo());
|
|
|
+ pageRequest.setPageSize(quTeamNumDto.getPageSize());
|
|
|
+ Page page = PageRequest.buildPageRequest(pageRequest);
|
|
|
+
|
|
|
+ if (quTeamNumDto.getCreateTimeStart() == null && quTeamNumDto.getCreateTimeEnd() == null) {
|
|
|
+ LocalDate date = LocalDate.now();
|
|
|
+ LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth()); // 获取当前月的第一天
|
|
|
+ LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth()); // 获取当前月的最后一天
|
|
|
+
|
|
|
+ quTeamNumDto.setCreateTimeStart(firstDay);
|
|
|
+ quTeamNumDto.setCreateTimeEnd(lastDay);
|
|
|
+ }
|
|
|
+
|
|
|
+ return sysUserMapper.quTeamNum(page, quTeamNumDto);
|
|
|
+ } else if ("2".equals(quTeamNumDto.getTeamOrUserFlag())) {
|
|
|
+ PageRequest pageRequest = new PageRequest();
|
|
|
+ pageRequest.setPageNum(quTeamNumDto.getPageNo());
|
|
|
+ pageRequest.setPageSize(quTeamNumDto.getPageSize());
|
|
|
+ Page page = PageRequest.buildPageRequest(pageRequest);
|
|
|
+
|
|
|
+ if (quTeamNumDto.getCreateTimeStart() == null && quTeamNumDto.getCreateTimeEnd() == null) {
|
|
|
+ LocalDate date = LocalDate.now();
|
|
|
+ LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth()); // 获取当前月的第一天
|
|
|
+ LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth()); // 获取当前月的最后一天
|
|
|
+
|
|
|
+ quTeamNumDto.setCreateTimeStart(firstDay);
|
|
|
+ quTeamNumDto.setCreateTimeEnd(lastDay);
|
|
|
+ }
|
|
|
+ return sysUserMapper.quUserNum(page, quTeamNumDto);
|
|
|
+ }
|
|
|
+ throw new SystemException("参数错误");
|
|
|
+ }
|
|
|
+ throw new SystemException("必传参数未传");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public SysUser findByUsername(String username) {
|
|
|
SysUser sysUser = null;
|