From fe9bc64232d79a67f2a71c4f34ccff894ea15d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Wed, 11 Jun 2025 17:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/JobStatisticsController.java   | 26 +++++++++++++++++++
 .../mapper/api/JobStatisticsMapper.xml        |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
index 43a19db..16fd827 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
@@ -6,11 +6,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.api.service.IJobStatisticsService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 作业统计 Controller
@@ -21,16 +25,38 @@ public class JobStatisticsController {
     
     @Autowired
     private IJobStatisticsService jobStatisticsService;
+    @Autowired
+    private IBasStockService basStockService;
 
     /**
      * 获取统计数据，包含：
      * 1. 当日入库和出库数量统计
      * 2. 货位状态统计
      * 3. 当前任务列表
+     * 4. 当月每日入库和出库数量统计
      */
     @GetMapping("/daily")
     public AjaxResult getDailyStatistics() {
         Map<String, Object> result = jobStatisticsService.getDailyStatistics();
         return AjaxResult.success(result);
     }
+    /**
+     * 获取库存信息（前50条）
+     */
+    @GetMapping("/list")
+    public AjaxResult getStockList() {
+        // 查询所有库存数据
+        List<BasStock> list = basStockService.selectBasStockList(new BasStock());
+
+        // 截取前50条数据
+        List<BasStock> topList = list.stream()
+                .limit(50)
+                .collect(Collectors.toList());
+
+        // 构建返回结果
+        Map<String, Object> result = new HashMap<>();
+        result.put("stockMsg", topList);
+
+        return AjaxResult.success(result);
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/api/JobStatisticsMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/JobStatisticsMapper.xml
index 709a9d8..ed4264c 100644
--- a/ruoyi-admin/src/main/resources/mapper/api/JobStatisticsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/api/JobStatisticsMapper.xml
@@ -23,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 查询当月每日入库出库统计 -->
     <select id="selectMonthlyStatistics" resultType="java.util.Map">
         SELECT 
-            CONVERT(varchar(10), create_time, 120) as date,
+            DAY(create_time) as date,
             SUM(CASE WHEN in_or_out &lt; 20 THEN 1 ELSE 0 END) as '入库',
             SUM(CASE WHEN in_or_out >= 20 THEN 1 ELSE 0 END) as '出库'
         FROM mydo_job_finish
         WHERE YEAR(create_time) = #{year}
         AND MONTH(create_time) = #{month}
-        GROUP BY CONVERT(varchar(10), create_time, 120)
+        GROUP BY DAY(create_time)
           ORDER BY date
     </select>