From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java
index 2927eba..0237113 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java
@@ -6,17 +6,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageDTO;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.ReportingStatusEnum;
+import com.ruoyi.common.enums.UserTypeEnum;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.BeanUtils;
-import com.ruoyi.common.utils.CollUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.system.domain.TbBasicData;
import com.ruoyi.system.domain.TbDept;
import com.ruoyi.system.dto.update.DeptFocusDTO;
import com.ruoyi.system.handler.DeptVerifyHandler;
import com.ruoyi.system.importExcel.DeptExcel;
import com.ruoyi.system.mapper.TbDeptMapper;
import com.ruoyi.system.query.DeptQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TbBasicDataService;
import com.ruoyi.system.service.TbDeptService;
import com.ruoyi.system.vo.DeptVO;
import lombok.RequiredArgsConstructor;
@@ -26,7 +30,11 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -41,19 +49,24 @@
public class TbDeptServiceImpl extends ServiceImpl<TbDeptMapper, TbDept> implements TbDeptService {
private final DeptVerifyHandler deptVerifyHandler;
+ private final ISysUserService sysUserService;
+ private final TbBasicDataService tbBasicDataService;
@Override
public PageDTO<DeptVO> queryPage(DeptQuery query) {
- Page<TbDept> page = new Page<>(query.getPageNum(), query.getPageSize());
- Page<TbDept> tbDeptPage = this.lambdaQuery().like(StringUtils.isNotEmpty(query.getAreaName()), TbDept::getAreaName, query.getAreaName())
- .like(StringUtils.isNotEmpty(query.getAccount()), TbDept::getAccount, query.getAccount())
- .like(StringUtils.isNotEmpty(query.getPhone()), TbDept::getPhone, query.getPhone())
- .orderByDesc(TbDept::getCreateTime)
+ Page<SysUser> page = new Page<>(query.getPageNum(), query.getPageSize());
+ Page<SysUser> userPage = sysUserService.lambdaQuery()
+ .eq(SysUser::getUserType, UserTypeEnum.DEPARTMENT.getCode())
+ .like(StringUtils.isNotEmpty(query.getAreaName()), SysUser::getAreaName, query.getAreaName())
+ .like(StringUtils.isNotEmpty(query.getUserName()), SysUser::getUserName, query.getUserName())
+ .like(StringUtils.isNotEmpty(query.getPhone()), SysUser::getPhoneNumber, query.getPhone())
+ .orderByDesc(SysUser::getCreateTime)
.page(page);
- if (CollUtils.isEmpty(tbDeptPage.getRecords())) {
+
+ if (CollUtils.isEmpty(userPage.getRecords())) {
return PageDTO.empty(page);
}
- return PageDTO.of(tbDeptPage, DeptVO.class);
+ return PageDTO.of(userPage, DeptVO.class);
}
@Override
@@ -105,13 +118,40 @@
@Override
public void focus(DeptFocusDTO dto) {
- TbDept dept = this.getById(dto.getId());
- if (Objects.isNull(dept)) {
- throw new ServiceException("非法参数");
+ Optional<SysUser> sysUser = sysUserService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId()).oneOpt();
+ if (sysUser.isPresent()) {
+ sysUserService.lambdaUpdate()
+ .eq(SysUser::getUserId, dto.getUserId())
+ .set(SysUser::getFocussed, dto.getFocussed())
+ .update();
}
- this.lambdaUpdate()
- .eq(TbDept::getId, dto.getId())
- .set(TbDept::getFocussed, dto.getFocussed())
- .update();
+ }
+
+ @Override
+ public R<Void> reportingMessage() {
+ Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
+ //当前季度开始
+ Date quarterStart = quarterDate.get("first");
+ //当前季度结束
+ Date quarterEnd = quarterDate.get("last");
+ //判断当前时间是否在季度初1-15号
+ Instant instant = quarterStart.toInstant();
+ LocalDate quarterStartLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(15);
+ LocalDate now = LocalDate.now();
+ //如果当前时间不在规定范围内：季度初1-15号
+ if (now.isAfter(quarterStartLocalDate) || now.isBefore(fifteenDaysLimit)) {
+ //查询所有的部门
+ List<SysUser> list = sysUserService.lambdaQuery().eq(SysUser::getUserType, UserTypeEnum.DEPARTMENT.getCode()).list();
+ Set<String> deptAreaCodeList = list.stream().map(SysUser::getAreaCode).collect(Collectors.toSet());
+ //查询当前季度填报了数据的部门
+ List<TbBasicData> filledBasicData = tbBasicDataService.lambdaQuery().between(TbBasicData::getCreateTime, quarterStartLocalDate, fifteenDaysLimit)
+ .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED).list();
+ Set<String> filledDeptCodes = filledBasicData.stream().map(TbBasicData::getDeptAreaCode).collect(Collectors.toSet());
+ if (!filledDeptCodes.containsAll(deptAreaCodeList)) {
+ return R.fail("有部门未上传季度数据");
+ }
+ }
+ return R.ok();
}
}
--
Gitblit v1.7.1