From 101555238a7980de86ec54ff313b697b711b152b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 04 六月 2024 16:56:23 +0800
Subject: [PATCH] 更改钢化数据库为sqlserve,恢复被覆盖的文件
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
index 83bc50b..93ba7fb 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
@@ -1,16 +1,18 @@
package com.mes.workstation.mapper;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.workstation.entity.UpWorkstation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.Map;
-import org.apache.ibatis.annotations.*;
-import com.mes.workstation.entity.UpWorkstation;
@Mapper
public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
//鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
@Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " +
- "on a.pattern_width=b.width and a.pattern_heigth=b.width " +
+ "on a.pattern_width=b.width and a.pattern_height=b.height " +
"and a.pattern_thickness=b.thickness where a.workstation_id=#{id}")
- Map<String,Object> selectPriority(int id);
-
+ Map<String, Object> selectPriority(int id);
+
}
--
Gitblit v1.8.0