From 0202954390f0b28bb093e0c5100ae026ba27559a Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 一月 2024 10:35:32 +0800
Subject: [PATCH] change timeFilter
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 1bc21f6..1d65de6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -1,7 +1,12 @@
package com.jcdm.main.bs.orderScheduling.controller;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.jcdm.common.core.domain.R;
+import com.jcdm.common.utils.StringUtils;
+import com.jcdm.main.bs.orderScheduling.vo.LineChartVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -46,12 +51,27 @@
return getDataTable(list);
}
+ /**
+ * 鏌ヨ涓嬬嚎鏁伴噺
+ */
+ @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
+ @GetMapping("/getOffLineNum")
+ public TableDataInfo getOffLineNum(BsOrderScheduling bsOrderScheduling)
+ {
+
+ List<LineChartVO> vo = bsOrderSchedulingService.getOffLineNum();
+ return getDataTable(vo);
+ }
+
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
@GetMapping("/list2")
public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
{
-// startPage();
- List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+// startPage();
+ List<BsOrderScheduling> list = new ArrayList<>();
+ if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){
+ list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ }
return getDataTable(list);
}
--
Gitblit v1.9.3