From 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 14:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into hsxny-new
---
src/main/java/com/ruoyi/home/service/HomeService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 42a6f27..e950e20 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -1,10 +1,9 @@
package com.ruoyi.home.service;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.home.dto.AnalysisCustomerContractAmountsDto;
-import com.ruoyi.home.dto.HomeBusinessDto;
-import com.ruoyi.home.dto.QualityStatisticsDto;
-import com.ruoyi.home.dto.StatisticsReceivablePayableDto;
+import com.ruoyi.home.dto.*;
+import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductWorkOrderDto;
import java.text.ParseException;
import java.util.List;
@@ -31,4 +30,9 @@
Map<String, Object> approveAndDeviceTodos();
Long noticesCount();
+
+ ProductionProgressDto productionProgress();
+ ProductionTurnoverDto workInProcessTurnover();
+
+ Long overdueReceivable();
}
--
Gitblit v1.9.3