From 2b82b1e1d31671b8581d2e463ad762bdf63dad30 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 十月 2025 16:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
index a24ffe2..53d159c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -192,10 +192,10 @@
query.setDeptIds(deptIds);
}
}
- String[] dateList = query.getDate().split(",");
+ String[] dateList = query.getDate().split("-");
String month = dateList[1];
int monthValue = Integer.parseInt(month);
- int year = LocalDateTime.now().getYear();
+ int year = Integer.parseInt(dateList[0]);
LocalDateTime firstDay = LocalDateTime.of(year, monthValue, 1, 0, 0, 0);
LocalDateTime lastDay = LocalDateTime.of(year, monthValue,
YearMonth.of(year, monthValue).lengthOfMonth(), 23, 59, 59);
@@ -241,6 +241,7 @@
if (StringUtils.hasLength(query.getNameOrCode())){
// 查询出资产名称或者资产编号符合条件的code
List<Integer> assetMainIds = assetMainService.lambdaQuery()
+ .eq(AssetMain::getAssetTypeId,8)
.and(wrapper -> wrapper.like(AssetMain::getAssetName, query.getNameOrCode())
.or()
.like(AssetMain::getAssetCode, query.getNameOrCode()))
--
Gitblit v1.7.1