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 | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 a3ca0de..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,6 +11,9 @@
<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="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>
<sql id="Base_Column_List">
@@ -25,11 +28,26 @@
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectItems" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from pr_order_item
- where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1
+ <!--绠楀嚭瀹屾垚鐜� Base_Column_List-->
+ SELECT aa.*, concat(round(((complete_number/number) * 100 ),2), '%') as complete_rate from (
+ select oi.id,oi.order_id,oi.pro_id,pp.`name`,oi.number, sum(IFNULL(pap.output_number,0)) as complete_number
+ from (SELECT * from pr_order_item where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1 ) oi
+ LEFT JOIN pr_assembly_plan pap
+ ON oi.order_id = pap.order_id AND oi.pro_id = pap.pro_id
+ LEFT JOIN plt_product pp
+ 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}
@@ -63,6 +81,7 @@
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
+ <!--@mbg.generated-->
update pr_order_item
<set>
<if test="orderId != null">
@@ -92,8 +111,8 @@
from pr_order_item p
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
- <if test="orderId != null and orderId != ''">
- p.orderId = #{orderId,jdbcType=BIGINT} and
+ <if test="orderId != null">
+ p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
order by id desc
@@ -109,8 +128,8 @@
from pr_order_item p
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
- <if test="orderId != null and orderId != ''">
- p.orderId = #{orderId,jdbcType=BIGINT} and
+ <if test="orderId != null">
+ p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
</select>
--
Gitblit v1.8.0