From e54284843886ae47801daeef54856efcfb30e482 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 十月 2025 13:55:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0bbaefb..0e48608 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
@@ -55,7 +55,8 @@
@Override
public PageInfo<TCrmClinicVO> pageList(TCrmClinicQuery query) {
- query.setCreateTime(LocalDate.now());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
+ query.setCreateTime(monthDate);
PageInfo<TCrmClinicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TCrmClinicVO> list = this.baseMapper.pageList(query,pageInfo);
if(CollectionUtils.isEmpty(list)){
@@ -63,7 +64,6 @@
}
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))
@@ -153,14 +153,14 @@
@Override
public List<TCrmClinicListExport> exportList(TCrmClinicQuery query) {
- query.setCreateTime(LocalDate.now());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
+ query.setCreateTime(monthDate);
List<TCrmClinicListExport> list = this.baseMapper.exportList(query);
if(CollectionUtils.isEmpty(list)){
return list;
}
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))
--
Gitblit v1.7.1