From e08c30f6a36a15be4e019b5e0d631f32f6d06029 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 24 十一月 2025 14:51:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
index 2b2bc54..3d06089 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
@@ -1,7 +1,12 @@
 package com.mes.damage.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.damage.entity.Damage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.damage.entity.dto.DamageDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,16 @@
  * @author wu
  * @since 2024-06-13
  */
-public interface DamageMapper extends BaseMapper<Damage> {
+@DS("northGlassMes")
+public interface DamageMapper extends MPJBaseMapper<Damage> {
 
+    List<Damage> queryUnTempByFlowCardId(@Param("flowCardId") String flowCardId);
+
+    List<DamageDTO> selectDamageList(
+            @Param("startTime") String startTime,
+            @Param("endTime") String endTime,
+            @Param("type") int type,
+            @Param("status") int status,
+            @Param("workingProcedure") String workingProcedure
+    );
 }

--
Gitblit v1.8.0