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 | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 bfd29a2..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;
@@ -13,7 +14,6 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanUtils;
import com.ruoyi.common.utils.CollUtils;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.TbBasicData;
@@ -35,7 +35,6 @@
import java.util.Date;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -145,11 +144,9 @@
@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();
@@ -164,7 +161,7 @@
.collect(Collectors.toSet());
//查询当前季度填报了数据的部门
List<TbBasicData> filledBasicData = tbBasicDataService.lambdaQuery()
- .between(TbBasicData::getCreateTime, quarterStartLocalDate, fifteenDaysLimit)
+ .between(TbBasicData::getReportingTime, quarterStartLocalDate, fifteenDaysLimit)
.eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED).list();
Set<String> filledDeptCodes = filledBasicData.stream().map(TbBasicData::getDeptAreaCode)
.collect(Collectors.toSet());
--
Gitblit v1.7.1