From 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b Mon Sep 17 00:00:00 2001 From: 张晓波 <bingbo1993@126.com> Date: 星期一, 11 十二月 2023 10:38:37 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml index aeef5b4..8ed1052 100644 --- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml +++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml @@ -88,9 +88,13 @@ <if test="isModel!=null and isModel!='' "> and tsp.is_model=#{isModel} </if> - <if test="isModel!=null and isModel!='' "> + <if test="sizeId!=null and sizeId!='' "> and tsp.size_id=#{sizeId} </if> + <if test="platUserName!=null and platUserName!='' "> + and spu.real_name regexp #{platUserName} + </if> + order by tsp.produce_number desc </select> <select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto"> -- Gitblit v1.9.3