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/PrAssemblyPlanMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 1d84692..bca0a78 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -23,6 +23,8 @@
<result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
<association property="batchNo" column="batch_id" javaType="java.lang.Long"
@@ -103,6 +105,12 @@
select name
from pr_assembly_plan
where id = #{id}
+ </select>
+ <select id="selectByBatchId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from pr_assembly_plan
+ where batch_id = #{batchId,jdbcType=BIGINT}
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
@@ -423,6 +431,14 @@
</if>
</select>
+ <select id="queryPlanList" resultType="cn.hutool.json.JSONObject">
+ select pp.`name` as pro_name, p.`name` ,p.number, p.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date,
+ TIMESTAMPDIFF(DAY, NOW(),p.end_date) AS days_difference
+ from (SELECT * FROM pr_assembly_plan WHERE STATUS = 1 and deleted = 0) p
+ LEFT JOIN plt_product pp
+ on p.pro_id = pp.id
+ ORDER BY end_date
+ </select>
</mapper>
--
Gitblit v1.8.0