From 65948198a6dc5e808440ac6874db6df8aab6d9ab Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 23 十二月 2024 09:15:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- manage/src/main/resources/mapping/TInventoryMapper.xml | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/manage/src/main/resources/mapping/TInventoryMapper.xml b/manage/src/main/resources/mapping/TInventoryMapper.xml index 4654405..07fe3d3 100644 --- a/manage/src/main/resources/mapping/TInventoryMapper.xml +++ b/manage/src/main/resources/mapping/TInventoryMapper.xml @@ -20,5 +20,28 @@ <sql id="Base_Column_List"> id, status, type, storeId, remark, createTime, updateTime, createBy, updateBy, isDelete </sql> + <select id="pageList" resultType="com.jilongda.manage.vo.TInventoryVO"> + select t1.*,t2.name as store from + t_inventory t1 + left join t_store t2 on t1.storeId = t2.id + where 1=1 + <if test="query.status != null "> + and t1.status = #{query.status} + </if> + <if test="query.createBy != null "> + and t1.createBy = #{query.createBy} + </if> + <if test="query.type != null "> + and t1.type = #{query.type} + </if> + <if test="query.storeId != null "> + and t1.storeId = #{query.storeId} + </if> + <if test="query.startTime != null and query.startTime != ''"> + and t1.createTime between #{query.startTime} and #{query.endTime} + </if> + and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()} + + </select> </mapper> -- Gitblit v1.7.1