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 selectFpStock(); - BoxPlanCompletion selectFpOrderInfo(); + List selectFpOrderInfo(); List 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 selectFpStock(); - BoxPlanCompletion selectFpOrderInfo(); + List selectFpOrderInfo(); List 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 selectFpOrderInfo() { return mapper.selectFpOrderInfo(); } ///////////////////////////////////////////////////////////////////////////