From b33e6f53dd537abaebad066de12474580fcc33b2 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期四, 21 八月 2025 15:03:14 +0800 Subject: [PATCH] Merge branch 'pim_ywx' --- src/main/resources/mapper/warehouse/WarehouseMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml new file mode 100644 index 0000000..dd45695 --- /dev/null +++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml @@ -0,0 +1,42 @@ +<?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.ruoyi.warehouse.mapper.WarehouseMapper"> + + + <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto"> + SELECT + w.*, + wgs.name, + doc.doc_name, + doc.doc_number, + dc.category + FROM warehouse_goods_shelves_rowcol wgsr + LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id + LEFT JOIN warehouse w ON w.id = wgs.warehouse_id + LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id + LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id + <where> + 1=1 + <if test="warehouse.warehouseName != null"> + and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%') + </if> + <if test="warehouse.id != null"> + and w.id = #{warehouse.id} + </if> + </where> + </select> + <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse"> + select * from warehouse + <where> + 1=1 + <if test="warehouse.warehouseName != null"> + and warehouse_name like concat('%',#{warehouse.warehouseName},'%') + </if> + <if test="warehouse.id != null"> + and w.id = #{warehouse.id} + </if> + </where> + </select> +</mapper> -- Gitblit v1.9.3