From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbDeptServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 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 0237113..cd9ab07 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
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageDTO;
@@ -11,7 +12,10 @@
import com.ruoyi.common.enums.ReportingStatusEnum;
import com.ruoyi.common.enums.UserTypeEnum;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.*;
+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.system.domain.TbBasicData;
import com.ruoyi.system.domain.TbDept;
import com.ruoyi.system.dto.update.DeptFocusDTO;
@@ -23,18 +27,22 @@
import com.ruoyi.system.service.TbBasicDataService;
import com.ruoyi.system.service.TbDeptService;
import com.ruoyi.system.vo.DeptVO;
+import java.io.InputStream;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
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>
@@ -57,9 +65,12 @@
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())
+ .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);
@@ -80,7 +91,8 @@
//使用自定义校验规则
importParams.setVerifyHandler(deptVerifyHandler);
InputStream inputStream = file.getInputStream();
- ExcelImportResult<DeptExcel> result = ExcelImportUtil.importExcelMore(inputStream, DeptExcel.class, importParams);
+ ExcelImportResult<DeptExcel> result = ExcelImportUtil.importExcelMore(inputStream,
+ DeptExcel.class, importParams);
inputStream.close();
List<DeptExcel> list = result.getList();
@@ -89,11 +101,12 @@
}
List<String> strings = hasDuplicateAreaCode(list);
if (!CollectionUtils.isEmpty(strings)) {
- throw new ServiceException(String.format("区划代码%s重复，请修改后重新导入", String.join(",", strings)));
- }else {
+ throw new ServiceException(
+ String.format("区划代码%s重复，请修改后重新导入", String.join(",", strings)));
+ } else {
List<TbDept> tbDeptList = BeanUtils.copyList(list, TbDept.class);
this.remove(null);
- tbDeptList.forEach(dept->{
+ tbDeptList.forEach(dept -> {
dept.setPassword(SecurityUtils.encryptPassword(dept.getPassword()));
});
this.saveBatch(tbDeptList);
@@ -102,6 +115,7 @@
/**
* 校验区划代码是否重复
+ *
* @param deptList 部门列表
* @return 重复的区划代码
*/
@@ -118,7 +132,8 @@
@Override
public void focus(DeptFocusDTO dto) {
- Optional<SysUser> sysUser = sysUserService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId()).oneOpt();
+ Optional<SysUser> sysUser = sysUserService.lambdaQuery()
+ .eq(SysUser::getUserId, dto.getUserId()).oneOpt();
if (sysUser.isPresent()) {
sysUserService.lambdaUpdate()
.eq(SysUser::getUserId, dto.getUserId())
@@ -129,25 +144,27 @@
@Override
public R<Void> reportingMessage() {
- Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
- //当前季度开始
- Date quarterStart = quarterDate.get("first");
- //当前季度结束
- Date quarterEnd = quarterDate.get("last");
+ Date date = new Date();
+ Date quarterStart = DateUtil.beginOfQuarter(date);
+ Date quarterEnd = DateUtil.endOfQuarter(date);
//判断当前时间是否在季度初1-15号
Instant instant = quarterStart.toInstant();
LocalDate quarterStartLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
- LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(15);
+ LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
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<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)
+ List<TbBasicData> filledBasicData = tbBasicDataService.lambdaQuery()
+ .between(TbBasicData::getReportingTime, quarterStartLocalDate, fifteenDaysLimit)
.eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED).list();
- Set<String> filledDeptCodes = filledBasicData.stream().map(TbBasicData::getDeptAreaCode).collect(Collectors.toSet());
+ Set<String> filledDeptCodes = filledBasicData.stream().map(TbBasicData::getDeptAreaCode)
+ .collect(Collectors.toSet());
if (!filledDeptCodes.containsAll(deptAreaCodeList)) {
return R.fail("有部门未上传季度数据");
}
--
Gitblit v1.7.1