From 102a1e17bb605cdc17ddcce3e3f916b9e98b3d96 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 17 Aug 2021 14:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/mapper/PrintLogMapper.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml
index b1166863..aa9635f4 100644
--- a/common/src/main/resources/mapper/PrintLogMapper.xml
+++ b/common/src/main/resources/mapper/PrintLogMapper.xml
@@ -539,8 +539,10 @@
 
     <!--自定义sql-->
     <select id="getPrintLogListByCondition" resultMap="BaseResultMap">
-        SELECT * FROM Z_PRINT_LOG PL
-        WHERE SITE = #{site}
+        SELECT PL.*, I.ITEM ,IT.DESCRIPTION ITEM_DESCRIPTION FROM Z_PRINT_LOG PL
+        LEFT JOIN ITEM I ON I.HANDLE = PL.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE
+        WHERE PL.SITE = #{site}
         <if test="startFromDate != null">
             AND PL.CREATED_DATE_TIME >= #{startFromDate}
         </if>
@@ -559,6 +561,9 @@
         <if test="sfc != null and sfc != ''">
             AND PL.SFC = #{sfc}
         </if>
+        <if test="item != null and item != ''">
+            AND I.ITEM = #{item}
+        </if>
         ORDER BY PL.CREATED_DATE_TIME DESC
     </select>