From 1f943b57caefe3e11c83d26f0316476a0832c1b7 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Fri, 17 Jan 2025 18:50:29 +0800
Subject: [PATCH] =?UTF-8?q?zengjia=20=E6=89=93=E5=8D=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/RecordInspectionTaskMapper.xml     | 27 ++++++++++---------
 .../manage/record_inspection/print.html       | 10 ++++---
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml
index cc14cf9..44694fa 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml
@@ -76,26 +76,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <select id="iRecordInspectionTaskService" resultMap="RecordInspectionTaskResult">
-
-
         select rit.objid,
-        rit.inspection_id,
-        area_id,
-        area_name,
-        plane_position,
-        count(info.inspection_id) as sanQty,
-        task_state,
-        rii.img_path
+                rit.inspection_id,
+                area_id,
+                area_name,
+                plane_position,
+                sanQty,
+                task_state,
+                rii.img_path
         from record_inspection_task rit
         left join record_inspection_img rii on rit.objid = rii.task_id
-        left join record_inspection_info as info on info.inspection_id=rit.inspection_id and
-        info.location_code=plane_position
+        left join (select count(inspection_id) as sanQty, location_code, inspection_id
+                    from record_inspection_info
+                    where inspection_id in
+        <foreach item="objid" collection="array" open="(" separator="," close=")">
+            #{objid}
+        </foreach>
+                    group by location_code, inspection_id) as info
+        on info.inspection_id = rit.inspection_id and info.location_code = plane_position
 
         where rit.inspection_id in
         <foreach item="objid" collection="array" open="(" separator="," close=")">
             #{objid}
         </foreach>
-        group by info. location_code, rit.inspection_id;
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html
index 3d7d705..fd0166a 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html
@@ -132,20 +132,22 @@
             cardIds.forEach(v => {
                 let data = cardList.filter(i => i.objid === v)
                 card += `
-        <div class="card" ${data.length >2 ? `style="width:calc(98% - 2px)"`:''}>
-            <div class="left" ${data.length >2 ? `style="width:calc(25% - 2px)"`:''}>
+        <div class="card" ${data.length > 2 ? `style="width:calc(98% - 2px)"` : ''}>
+            <div class="left" ${data.length > 2 ? `style="width:calc(25% - 2px)"` : ''}>
                 <div style="height: 100%;display: flex;  flex-direction: column;justify-content: space-between;">
                     <div><span style="display: inline-block;width: 70px;text-align: right">机坪名称:  </span><span style="display: inline-block;width:12px; "> </span>${data[0].areaName || ''}</div>
                     <div><span style="display: inline-block;width: 70px;text-align: right">机位码:  </span><span style="display: inline-block;width:12px; "> </span>${data[0].planePosition || ''}</div>
+                      <div><span style="display: inline-block;width: 70px;text-align: right">扫码数量:  </span><span style="display: inline-block;width:12px; "> </span>${data[0].sanQty || '0'}</div>
+
                     <div><span style="display: inline-block;width: 70px;text-align: right">巡检状态:  </span><span style="display: inline-block;width:12px; "> </span>${data[0].taskState || ''}</div>
                 </div>
             </div>
-            <div class="right" ${data.length >2 ? `style="width:calc(75% - 2px)"`:''}>
+            <div class="right" ${data.length > 2 ? `style="width:calc(75% - 2px)"` : ''}>
             ${
                     data.map(vv => {
                         return `
                 <div class="image1" style="width:calc(${100 / data.length}% - ${data.length}px)">
-                    ${vv.imgPath ? `<img src="${vv.imgPath }" alt="">` : ''}
+                    ${vv.imgPath ? `<img src="${vv.imgPath}" alt="">` : ''}
                 </div>`
                     }).join('')
                 }