From 3c61c5f4bc92f75b4fe60653eaa676a21cde4325 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 19 十二月 2024 17:09:02 +0800
Subject: [PATCH] edit BI Device log and planList
---
pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..27effe0 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -41,6 +41,9 @@
<select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
select name proName from plt_product where id=#{proId,jdbcType=BIGINT}
</select>
+ <select id="selectProTypeById" parameterType="java.lang.Long" resultType="java.lang.String">
+ select type proName from plt_product where id=#{proId,jdbcType=BIGINT}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap2">
<!--@mbg.generated-->
select
@@ -77,7 +80,7 @@
<if test="deleted != null">
deleted,
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt,
</if>
<if test="remark != null and remark !=''">
@@ -109,7 +112,7 @@
<if test="deleted != null">
#{deleted,jdbcType=VARCHAR },
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
#{dt,jdbcType=TIMESTAMP},
</if>
<if test="remark != null and remark !=''">
@@ -136,7 +139,7 @@
<if test="dMobile != null and dMobile !=''">
d_mobile = #{dMobile,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="remark != null and remark !=''">
@@ -198,11 +201,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
@@ -211,7 +214,7 @@
select max(code) from plt_product
</select>
<select id="exists" resultType="java.lang.Boolean">
- select count(1) from plt_product where name = #{name}
+ select count(1) from plt_product where name = #{name} and type = #{type}
<if test="id != null">
and id != #{id}
</if>
--
Gitblit v1.8.0