From 595b8d1c505777db0d449622419d5e35eaf5cd7f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:46:59 +0800
Subject: [PATCH] 增加放回接口和绕过全局逻辑方法,还原部门被覆盖代码

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
index 65122ab..78c9c90 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
@@ -4,6 +4,8 @@
 import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.temperingglass.entity.TemperingGlassInfo;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -19,5 +21,13 @@
 public interface TemperingGlassInfoMapper extends MPJBaseMapper<TemperingGlassInfo> {
 
     boolean saveBatch(@Param(value = "list") List<TemperingGlassInfo> list);
-
+    //缁曡繃鍏ㄥ眬閫昏緫杩涜鏌ヨ
+    @Select("SELECT * FROM tempering_glass_info " + "WHERE tempering_layout_id = #{temperingLayoutId} " + "AND engineer_id = #{engineerId} " + "ORDER BY tempering_layout_id DESC, tempering_feed_sequence ASC")
+    List<TemperingGlassInfo> selectByEngineerIdAndLayoutId(String engineerId, Integer temperingLayoutId);
+    //缁曡繃鍏ㄥ眬閫昏緫杩涜淇敼
+    @Update("UPDATE tempering_glass_info " +
+            "SET state = #{state}, " +
+            "deleted = CASE WHEN #{state} < 8 THEN 0 ELSE deleted END " +
+            "WHERE glass_id = #{glassId}")
+    Integer updateTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo);
 }

--
Gitblit v1.8.0