From da0e9fff7f8ba1bd163836240ebb9935fa5c25ef Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 13:47:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_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 266a8ce..2dbab27 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;
@@ -29,4 +28,9 @@
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
Map<String, Object> approveAndDeviceTodos();
+
+ Long noticesCount();
+
+ ProductionProgressDto productionProgress();
+ ProductionTurnoverDto workInProcessTurnover();
}
--
Gitblit v1.9.3