From 7d1feae71bfd79b9021e516916b79f918bfcbcd9 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 16:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
index 3a5e9e0..45264b2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -581,12 +581,12 @@
Map<Integer, String> categoryMap;
if (!projects.isEmpty()) {
// 判断项目类型：在建工程 or 固定资产
- Integer usageType = projects.get(0).getUsageType();
- if (usageType != null && usageType == 0) {
+ Integer usageType = projects.get(0).getType();
+ if (usageType != null && usageType != 2) {
// 在建工程
categoryMap = projectCategoryCalculator.calculateOngoingProjectCategories(
projects, clientId, startDate, endDate);
- } else if (usageType != null && usageType == 1) {
+ } else if (usageType != null && usageType == 2) {
// 固定资产
categoryMap = projectCategoryCalculator.calculateFixedAssetCategories(
projects, clientId, startDate, endDate);
--
Gitblit v1.7.1