From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
index 363cc2f..d473442 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
@@ -11,7 +11,7 @@
<result property="number" column="number" jdbcType="INTEGER"/>
<result property="completeNumber" column="complete_number" jdbcType="INTEGER"/>
<result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
- <result property="proName" column="pro_id" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
<!-- <association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>-->
</resultMap>
@@ -38,6 +38,16 @@
ON oi.pro_id = pp.id
GROUP BY oi.id,oi.order_id,oi.pro_id,oi.number) aa
</select>
+ <select id="selectDistinctPro" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--Distinct鍑簅rder_id涓殑浜у搧 Base_Column_List-->
+ select DISTINCT(oi.order_id),oi.pro_id,pp.`name`
+ from (SELECT * from pr_order_item where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1 ) oi
+ LEFT JOIN plt_product pp
+ ON oi.pro_id = pp.id
+ GROUP BY oi.order_id,oi.pro_id
+ ORDER BY oi.order_id
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_order_item
where id = #{id,jdbcType=BIGINT}
@@ -54,39 +64,39 @@
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem" useGeneratedKeys="true">
insert into pr_order_item
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null and id !=''">id,</if>
- <if test="orderId!= null and orderId !=''">order_id,</if>
- <if test="proId != null and proId !=''">pro_id,</if>
- <if test="number != null and number !=''">number,</if>
- <if test="completeNumber!= null and completeNumber !=''">complete_number,</if>
- <if test="deleted != null and deleted !=''">deleted,</if>
+ <if test="id != null">id,</if>
+ <if test="orderId != null">order_id,</if>
+ <if test="proId != null">pro_id,</if>
+ <if test="number != null">number,</if>
+ <if test="completeNumber != null">complete_number,</if>
+ <if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
- <if test="orderId!= null and orderId !=''">#{orderId,jdbcType=BIGINT},</if>
- <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
- <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
- <if test="completeNumber!= null and completeNumber !=''">#{completeNumber,jdbcType=INTEGER},</if>
- <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
+ <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
+ <if test="number != null">#{number,jdbcType=INTEGER},</if>
+ <if test="completeNumber != null">#{completeNumber,jdbcType=INTEGER},</if>
+ <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
<!--@mbg.generated-->
update pr_order_item
<set>
- <if test="orderId!= null and orderId !=''">
+ <if test="orderId != null">
order_id = #{orderId,jdbcType=BIGINT},
</if>
- <if test="proId != null and proId !=''">
+ <if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT},
</if>
- <if test="number != null and number !=''">
+ <if test="number != null">
number = #{number,jdbcType=INTEGER},
</if>
- <if test="completeNumber!= null and completeNumber !=''">
+ <if test="completeNumber != null">
complete_number = #{completeNumber,jdbcType=INTEGER},
</if>
- <if test="deleted != null and deleted !=''">
+ <if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
</if>
</set>
@@ -101,7 +111,7 @@
from pr_order_item p
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
- <if test="orderId != null and orderId != ''">
+ <if test="orderId != null">
p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
@@ -118,7 +128,7 @@
from pr_order_item p
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
- <if test="orderId != null and orderId != ''">
+ <if test="orderId != null">
p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
--
Gitblit v1.8.0