From 49eee4769a63b0c24d19bd676cdb0eb0df0a6541 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 20 五月 2025 18:32:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml
new file mode 100644
index 0000000..bf80750
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aps.core.mapper.ApsWeldSeamStandardMapper">
+    
+    <resultMap type="com.aps.core.domain.ApsWeldSeamStandard" id="ApsWeldSeamStandardResult">
+        <result property="id"    column="id"    />
+        <result property="itemCode"    column="item_code"    />
+        <result property="itemFigure"    column="item_figure"    />
+        <result property="itemFigureVersion"    column="item_figure_version"    />
+        <result property="hupQty"    column="hup_qty"    />
+        <result property="lodQty"    column="lod_qty"    />
+        <result property="type"    column="type"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectApsWeldSeamStandardVo">
+        select id, item_code, item_figure, item_figure_version, hup_qty, lod_qty, type, del_flag from aps_weld_seam_standard
+    </sql>
+
+    <select id="selectApsWeldSeamStandardList" parameterType="com.aps.core.domain.ApsWeldSeamStandard" resultMap="ApsWeldSeamStandardResult">
+        <include refid="selectApsWeldSeamStandardVo"/>
+        <where>  
+            <if test="itemCode != null  and itemCode != ''"> and item_code LIKE '%' || #{itemCode} || '%'</if>
+            <if test="itemFigure != null  and itemFigure != ''"> and item_figure = #{itemFigure}</if>
+            <if test="itemFigureVersion != null  and itemFigureVersion != ''"> and item_figure_version = #{itemFigureVersion}</if>
+            <if test="hupQty != null "> and hup_qty = #{hupQty}</if>
+            <if test="lodQty != null "> and lod_qty = #{lodQty}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            and del_flag = 0
+        </where>
+    </select>
+</mapper> 
\ No newline at end of file

--
Gitblit v1.9.3