From 111a401f033749c965f02f58c586a8feafd9afd1 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 11:23:46 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
index 22d4968..4f0710d 100644
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
+++ b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
@@ -45,11 +45,17 @@
map.put("pipePlanActual",yearCountList);
//月度生产计划和实际完成
- List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
- map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
+ //List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
+ //map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
//原料消耗 周月
- List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
- map.put("materialWeekAndMonths",materialWeekAndMonths);
+ //List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
+ //map.put("materialWeekAndMonths",materialWeekAndMonths);
+ //钢筋消耗
+ List<HashMap<String,Object>> steelUseList = bigScreenMapper.querySteelMake();
+ map.put("steelUse",steelUseList);
+ //缓存区
+ List<HashMap<String,Object>> restInfo = bigScreenMapper.queryRestInfo();
+ map.put("restInfo",restInfo);
//水养池
List<WaterCulInfo> culInfoList = bigScreenMapper.WaterCulInfo(companyId);
map.put("waterCulInfo",culInfoList);
--
Gitblit v1.9.3