From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/StatisticsService.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/StatisticsService.java b/server/src/main/java/doumeemes/service/ext/StatisticsService.java
index 69571bb..72de38a 100644
--- a/server/src/main/java/doumeemes/service/ext/StatisticsService.java
+++ b/server/src/main/java/doumeemes/service/ext/StatisticsService.java
@@ -1,20 +1,12 @@
package doumeemes.service.ext;
-import doumeemes.core.model.ApiResponse;
-import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
-import doumeemes.dao.business.dto.statistics.StatisticsPlanDataModel;
-import doumeemes.dao.business.dto.statistics.Unqualified7DayModel;
-import doumeemes.dao.business.dto.statistics.UserProduceTopModel;
-import doumeemes.dao.business.model.Workorder;
-import doumeemes.dao.ext.bean.FinishedInBean;
-import doumeemes.dao.ext.bean.FinishedInNewBean;
-import doumeemes.dao.ext.dto.QueryWorkorderExtDTO;
-import doumeemes.dao.ext.vo.PlansExtListH5VO;
-import doumeemes.dao.ext.vo.WorkorderExtListCountVO;
-import doumeemes.dao.ext.vo.WorkorderExtListVO;
-import doumeemes.dao.ext.vo.WorkorderListModelVO;
+import doumeemes.dao.business.dto.statistics.*;
+import doumeemes.dao.ext.dto.QueryDeviceCheckExtDTO;
+import doumeemes.dao.ext.dto.QueryPlansExtDTO;
+import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
+import doumeemes.dao.ext.vo.*;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,6 +22,22 @@
StatisticsPlanDataModel getPlansData(Integer companyId, Integer departId);
- List<UserProduceTopModel> getUserProduceTopData(Integer companyId, Integer departId);
- List<Unqualified7DayModel> getUnqualified7DayData(Integer companyId, Integer departId);
+ List<UserProduceTopModel> getUserProduceTopData(Integer companyId, Integer departId, Integer procedureId);
+ List<Unqualified7DayModel> getUnqualified7DayData(Integer companyId, Integer departId, Integer procedureId);
+ List<UnqualifiedCateModel> getUnqualifiedCateData(Integer companyId, Integer departId, Integer procedureId);
+
+ PageData<RecordLogModel> getRecordLogPage(Integer companyId, Integer departId, PageWrap<QueryWorkorderRecordExtDTO> pageWrap);
+
+ PageData<DeviceCheckExtListVO> getDeviceCheckPage(Integer companyId, Integer departId,PageWrap<QueryDeviceCheckExtDTO> pageWrap);
+
+ StatisticsPlanDataModel getProcedurePlanData(Integer companyId, Integer departId, Integer procedureId);
+
+ List<ProcedurePlansPageModel> getProcedurePlansPage(Integer companyId, Integer departId, Integer procedureId);
+
+ List<WorkPlansPageModel> getWorkPlansList(Integer companyId, Integer departId);
+
+ List<ProcedureProcessModel> getProcedureProcessList(Integer companyId, Integer departId);
+ List<StockDataModel> getStockList(Integer companyId, Integer departId);
+
+ List<DepartmentExtListVO> getDepartmentList(Integer companyId);
}
--
Gitblit v1.9.3