From 582b930e06e46b9e89471c6dca962a4ecb3eb6f8 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Sun, 20 Nov 2022 18:25:16 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/scada/ScadaUkHourData.java | 2 +-
 .../main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java | 1 +
 .../ruoyi/system/service/impl/ImosPrPlanServiceImpl.java    | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java
index f9e86aa..a5d1e7e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java
@@ -33,6 +33,6 @@ public class ScadaUkHourData {
 //    @Column(name = "DEVICESTATE")
 //    public int DEVICESTATE;
 
-    @Column(name = "recordTime")
+    @Column(name = "RECORDTIME")
     public Date recordTime;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
index 73fb0f5..6f81533 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
@@ -231,6 +231,7 @@ public interface ImosPrPlanMapper
      */
     List<OrderInfo> getAluminumClassPlanInfo(int in_id);
 
+    @DataSource(value = DataSourceType.MASTER)
     List<ScadaUkHourData> findByRecordTimeBetweenNew(int in_id);
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
index 3ce4823..080ccb0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
@@ -488,7 +488,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
                 map.put("0",orderTypeItem);
                 Long planQtyItem = orderInfo.stream().filter(x->x.getOrderType().equals(orderTypeItem)).collect(Collectors.toList()).stream().mapToLong(OrderInfo ::getPlannedProduction).sum()/orderInfo.stream().filter(x->x.getOrderType().equals(orderTypeItem)).collect(Collectors.toList()).size();
                 map.put("1",planQtyItem);
-                map.put("2","10");
+                map.put("2",planQtyItem/10);
 
                 for(int i = 7;i < 19;i++){
                     Long recordTimeitem = Convert.toLong(i);
@@ -768,9 +768,9 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
     }
 
     @Override
-    @DataSource(value = DataSourceType.MASTER)
     public List<ScadaUkHourData> findByRecordTimeBetweenNew() {
-        return imosPrPlanMapper.findByRecordTimeBetweenNew(in_id);
+        List<ScadaUkHourData> byRecordTimeBetweenNew = imosPrPlanMapper.findByRecordTimeBetweenNew(in_id);
+        return byRecordTimeBetweenNew;
     }
 
     @Override