From 7df0337148d9d6d6158ad93564aa2a3c827265cc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 15:17:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index 1550b2e..d2552ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -18,11 +18,9 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -65,9 +63,10 @@
try {
// 判断哪些诊所本月没有业绩达标
List<TCrmClinic> clinics = crmClinicService.list();
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinic clinic : clinics) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(clinic.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
--
Gitblit v1.7.1