From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcTestTaskMapper.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcTestTaskMapper.java b/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcTestTaskMapper.java
new file mode 100644
index 0000000..de11259
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcTestTaskMapper.java
@@ -0,0 +1,37 @@
+package com.mes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.entity.PlcTestTask;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * PLC娴嬭瘯浠诲姟Mapper
+ *
+ * @author huang
+ * @date 2025/11/04
+ */
+@Mapper
+public interface PlcTestTaskMapper extends BaseMapper<PlcTestTask> {
+
+ /**
+ * 鏌ヨ鎸囧畾椤圭洰鐨勬墍鏈変换鍔�
+ * @param projectId 椤圭洰ID
+ * @return 浠诲姟鍒楄〃
+ */
+// @Select("SELECT * FROM `plc_test_task` WHERE `project_id` = #{projectId} ORDER BY `created_at` DESC")
+// List<PlcTestTask> selectByProjectId(@Param("projectId") String projectId);
+//
+ /**
+ * 鏌ヨ鎸囧畾椤圭洰鐨勮繍琛屼腑浠诲姟
+ * 鍖呮嫭RUNNING銆乄AITING_REPORT绛夎繘琛屼腑鐘舵��
+ * @param projectId 椤圭洰ID
+ * @return 杩涜涓殑浠诲姟鍒楄〃
+ */
+ @Select("SELECT * FROM `plc_test_task` WHERE `project_id` = #{projectId} AND `status` IN ('RUNNING', 'WAITING_REPORT', 'WAITING_CONFIRM') ORDER BY `created_at` DESC")
+ List<PlcTestTask> selectRunningTasks(@Param("projectId") String projectId);
+
+}
--
Gitblit v1.8.0