From 1cf92e13371b55c4449ccb48b264eea547eccb86 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 10:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/service/HomeService.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 49e7530..010e8c1 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -1,12 +1,13 @@
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;
+import java.util.Map;
/**
* @author :yys
@@ -22,7 +23,14 @@
QualityStatisticsDto qualityStatistics();
- List<ApproveProcess> todos();
+ List<ApproveProcess> todos() throws ParseException;
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
+
+ Map<String, Object> approveAndDeviceTodos();
+
+ Long noticesCount();
+
+ ProductionProgressDto productionProgress();
+ Map<Integer, List<ProductWorkOrderDto>> workInProcessTurnover();
}
--
Gitblit v1.9.3