From 83e7cd4dff5c5b8d0f5e6b34f68db7ad726cb964 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 14:56:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
index 973635f..75cc3da 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
@@ -24,8 +24,10 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -56,10 +58,11 @@
}
List<String> clinicIds = list.stream().map(TCrmClinicVO::getId).collect(Collectors.toList());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getClinicId, clinicIds)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinicVO tCrmClinicVO : list) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(tCrmClinicVO.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
@@ -144,10 +147,11 @@
}
List<String> clinicIds = list.stream().map(TCrmClinicListExport::getId).collect(Collectors.toList());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getClinicId, clinicIds)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinicListExport crmClinicListExport : list) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(crmClinicListExport.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
--
Gitblit v1.7.1