From f495ce647341693b40c819d21dfada38c609206b Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 20 Jul 2022 15:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/web/controller/broad/FPBroadController.java  | 2 +-
 .../src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java  | 2 +-
 .../main/java/com/ruoyi/system/service/IBroadDataService.java   | 2 +-
 .../com/ruoyi/system/service/impl/BroadDataServiceImpl.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
index 8c67f23..f5dde2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
@@ -42,7 +42,7 @@ public class FPBroadController {
     @PostMapping("/selectFpOrderInfo")
     @ApiOperation("中间生产数量统计")
     private String selectFpOrderInfo() {
-        return JSONObject.toJSONString(service.selectFpOrderInfo());
+        return JSONArray.toJSONString(service.selectFpOrderInfo());
     }
 
     @PostMapping("/selectDeviceStation")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
index 53f3f02..b781101 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
@@ -47,7 +47,7 @@ public interface BroadDataMapper {
 
     List<BoxOutput> selectFpStock();
 
-    BoxPlanCompletion selectFpOrderInfo();
+    List<BoxOutput> selectFpOrderInfo();
 
     List<BoxOutput> mtk_selectInStore3d();
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
index ac7f5d4..617056f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
@@ -46,7 +46,7 @@ public interface IBroadDataService {
 
     List<BoxOutput> selectFpStock();
 
-    BoxPlanCompletion selectFpOrderInfo();
+    List<BoxOutput> selectFpOrderInfo();
 
     List<BoxOutput> mtk_selectInStore3d();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
index 610d730..c52f082 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
@@ -77,7 +77,7 @@ public class BroadDataServiceImpl implements IBroadDataService
     }
 
     @Override
-    public BoxPlanCompletion selectFpOrderInfo() {
+    public List<BoxOutput> selectFpOrderInfo() {
         return mapper.selectFpOrderInfo();
     }
 ///////////////////////////////////////////////////////////////////////////