parent: e7a0c4cf | 补丁 | 提交 | ignore whitespace
guoyuji
2024-10-12 b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
1个文件已修改
15 ■■■■■ 已修改文件
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml


@@ -70,6 +70,9 @@


            <if test="product.createTime != null and product.createTime != ''">


                and date(a.create_time) like concat('%',#{product.createTime},'%')


            </if>


            <if test="product.remarks != null and product.remarks != ''">


                and a.remarks like concat('%',#{product.remarks},'%')


            </if>


        </where>




        order by id desc


@@ -112,11 +115,19 @@


            <if test="product.createTime != null and product.createTime != ''">


                and date(a.create_time) regexp #{product.createTime}


            </if>


            <if test="product.remarks != null and product.remarks != ''">


                and a.remarks like concat('%',#{product.remarks},'%')


            </if>


            <if test="product.state != null">


                and a.state = #{product.state}


            </if>


            <if test="product.productAbbreviation != null and product.productAbbreviation != ''">


                and a.product_abbreviation like concat('%',#{product.productAbbreviation},'%')


            </if>


        </where>




        order by a.id desc


        limit #{offset},#{pageSize}


        ;


        limit #{offset},#{pageSize};


    </select>


    


    <update id="updateProductStateById">