From 0ad8e58952b396bd689433a0b29e4a66f9bc0817 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 17:33:39 +0800
Subject: [PATCH] 导出用户信息,主要导出用户二维码

---
 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 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 6531127..0fbe098 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"
@@ -430,7 +432,7 @@
     </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,
+        select pp.`name` as pro_name, p.`name` ,p.number,p.input_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

--
Gitblit v1.8.0