冲突解决

zss

昨天 ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -2,7 +2,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">

    <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo">
    <select id="listPage" resultType="com.ruoyi.sales.vo.ShippingInfoVo">
        SELECT
        s.id,
        s.sales_ledger_id,
@@ -14,12 +14,19 @@
        s.update_user,
        s.tenant_id,
        sl.sales_contract_no,
        sl.customer_name
        sl.customer_name,
        slp.product_category,
        slp.specification_model,
        slp.quantity
        FROM shipping_info s
        LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
        left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
        WHERE 1=1
        <if test="req.salesContractNo != null and req.salesContractNo != ''">
            AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
        </if>
          <if test="req.productCategory != null and req.productCategory != ''">
            AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
        </if>
        <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
            AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
@@ -41,4 +48,4 @@
        FROM shipping_info s
                 LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
    </select>
</mapper>
</mapper>