From 25835dde83a66dcf135226134fe9f70a2c3bb289 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 十二月 2024 18:07:51 +0800
Subject: [PATCH] 镜架管理

---
 manage/src/main/resources/mapping/TModelMapper.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/manage/src/main/resources/mapping/TModelMapper.xml b/manage/src/main/resources/mapping/TModelMapper.xml
index dd419d4..e2a025d 100644
--- a/manage/src/main/resources/mapping/TModelMapper.xml
+++ b/manage/src/main/resources/mapping/TModelMapper.xml
@@ -18,11 +18,30 @@
         <result column="createBy" property="createBy" />
         <result column="updateBy" property="updateBy" />
         <result column="isDelete" property="isDelete" />
+        <result column="inventory" property="inventory" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, brandId, supplierId, materialId, color, sale, cost, name, status, createTime, updateTime, createBy, updateBy, isDelete
+        id, brandId, supplierId, materialId, color, sale, cost, `name`, status, createTime, updateTime, createBy, updateBy, isDelete,inventory
     </sql>
+    <select id="pageList" resultType="com.jilongda.manage.vo.TModelVO">
+        select <include refid="Base_Column_List"></include>
+        from t_model
+        <where>
+            <if test="query.name != null and query.name != ''">
+                and `name` like concat('%',#{query.name},'%')
+            </if>
+            <if test="query.brandId != null">
+                and brandId = #{query.brandId}
+            </if>
+            <if test="query.supplierId != null">
+                and supplierId = #{query.supplierId}
+            </if>
+            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        GROUP BY `name`
+        ORDER BY createTime DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1