From feb290a268428fec3f331d09c51894de5728ebc1 Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期二, 27 八月 2024 16:13:04 +0800 Subject: [PATCH] fix order test error --- pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml | 2 +- pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 4 ++-- pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml index 5b01533..e718314 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml @@ -198,11 +198,11 @@ <property name="alias" value="p"/> </include> FROM - <if test="orderId != null"> - (select * from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi, + <if test="orderId != null and orderId != ''"> + (select distinct(pro_id) as pro_id from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi, </if> (select * from plt_product where deleted!=1) p - <if test="orderId != null"> + <if test="orderId != null and orderId != ''"> WHERE poi.pro_id = p.id </if> order by id desc diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml index 632d5f9..1faf981 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml @@ -73,7 +73,7 @@ <if test="creator != null and creator !=''"> creator = #{creator,jdbcType=VARCHAR}, </if> - <if test="dt != null and dt !=''"> + <if test="dt != null"> dt = #{dt,jdbcType=TIMESTAMP}, </if> <if test="remark != null and remark !=''"> diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml index 29162fd..8fc48f4 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml @@ -110,8 +110,8 @@ </if> </trim> </select> - <!--涓嬫媺鑿滃崟 瀹炵幇璁㈠崟 浜у搧鑱斿姩鏁堟灉--> - <select id="selectAll" resultMap="BaseResultMap3"> + <!--涓嬫媺鑿滃崟璁㈠崟--> + <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder"> select <include refid="Base_Column_List" /> from pr_order p -- Gitblit v1.8.0