From fe33646ee6e2d1e57f2b51812e94983a0e9efb04 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 14 十二月 2025 16:51:28 +0800
Subject: [PATCH] feat: 修复统计
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTaskMapper.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTaskMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTaskMapper.java
index 6a914c5..f900677 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTaskMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTaskMapper.java
@@ -1,9 +1,14 @@
package com.ruoyi.system.mapper;
+import java.util.Date;
import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.vo.TaskQueryVO;
import com.ruoyi.system.domain.vo.TaskStatisticsVO;
+import org.apache.ibatis.annotations.Param;
/**
* 浠诲姟绠＄悊Mapper鎺ュ彛
@@ -11,6 +16,7 @@
* @author ruoyi
* @date 2024-01-15
*/
+@DataSource(DataSourceType.MASTER)
public interface SysTaskMapper {
/**
@@ -24,7 +30,7 @@
/**
* 鏌ヨ浠诲姟绠＄悊鍒楄〃
*
- * @param sysTask 浠诲姟绠＄悊
+ * @param queryVO 浠诲姟绠＄悊
* @return 浠诲姟绠＄悊闆嗗悎
*/
public List<SysTask> selectSysTaskList(TaskQueryVO queryVO);
@@ -92,6 +98,14 @@
public SysTask selectSysTaskByTaskCode(String taskCode);
/**
+ * 鏌ヨ鎸囧畾鏃ユ湡鍓嶇紑鐨勬渶澶т换鍔＄紪鍙�
+ *
+ * @param datePrefix 鏃ユ湡鍓嶇紑锛堝锛歍ASK20250923锛�
+ * @return 鏈�澶т换鍔＄紪鍙�
+ */
+ public String selectMaxTaskCodeByDatePrefix(String datePrefix);
+
+ /**
* 鏇存柊浠诲姟鐘舵��
*
* @param sysTask 浠诲姟淇℃伅
@@ -106,4 +120,24 @@
* @return 缁撴灉
*/
public int assignTask(SysTask sysTask);
+
+ /**
+ * 鏌ヨ杞﹁締姝ｅ湪杩涜涓殑浠诲姟
+ * 姝ｅ湪杩涜涓殑浠诲姟鏄寚鐘舵�佷笉涓猴細PENDING锛堝緟澶勭悊锛夈�丆OMPLETED锛堝凡瀹屾垚锛夈�丆ANCELLED锛堝凡鍙栨秷锛夌殑浠诲姟
+ *
+ * @param vehicleId 杞﹁締ID
+ * @return 姝ｅ湪杩涜涓殑浠诲姟鍒楄〃
+ */
+ public List<SysTask> selectActiveTasksByVehicleId(Long vehicleId);
+
+ /**
+ * 鏍规嵁鏃堕棿鍜岃溅杈嗘潵鏌ヨ璇ヨ溅杈嗘槸鍚︽鍦ㄤ换鍔′腑
+ * @param vehicleId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public List<SysTask> selectTaskByVehicleIdAndDate(@Param("vehicleId") Long vehicleId,
+ @Param("startTime") String startTime,
+ @Param("endTime") String endTime);
}
--
Gitblit v1.9.1