修改 打印显示数量

ruoyi-api/src/main/resources/mapper/ApiMapper.xml

@@ -245,7 +245,7 @@
     </select>
     <!--完成任务-->
     <update id="updataInspectionTaskByObjid">
-        UPDATE record_inspection_task SET task_state = #{state},remark = #{remark} WHERE objid = #{tableId};
+        UPDATE record_inspection_task SET task_state = #{state},remark = #{remark},update_time=now() WHERE objid = #{tableId};
     </update>
 
     <insert id="insertInspetionPictrue">

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java

@@ -36,6 +36,15 @@ public class RecordInspectionTask extends BaseEntity
     @Excel(name = "完成状态")
     private String taskState;
     private String imgPath;
+private int sanQty;
+
+    public int getSanQty() {
+        return sanQty;
+    }
+
+    public void setSanQty(int sanQty) {
+        this.sanQty = sanQty;
+    }
 
     public String getImgPath() {
         return imgPath;

ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml

@@ -12,10 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planePosition"    column="plane_position"    />
         <result property="taskState"    column="task_state"    />
         <result property="imgPath"    column="img_path"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="sanQty"    column="sanQty"    />
     </resultMap>
 
     <sql id="selectRecordInspectionTaskVo">
-        select objid, inspection_id, area_id, area_name, plane_position, task_state from record_inspection_task
+        select objid, inspection_id, area_id, area_name, plane_position, task_state,update_time from record_inspection_task
     </sql>
 
     <select id="selectRecordInspectionTaskList" parameterType="RecordInspectionTask" resultMap="RecordInspectionTaskResult">
@@ -75,14 +77,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     <select id="iRecordInspectionTaskService" resultMap="RecordInspectionTaskResult">
 
-        select rit.objid, rit.inspection_id, area_id, area_name, plane_position, task_state,
+
+        select rit.objid,
+        rit.inspection_id,
+        area_id,
+        area_name,
+        plane_position,
+        count(info.inspection_id) as sanQty,
+        task_state,
         rii.img_path
         from record_inspection_task rit
-        left join bg_wheel_chocks.record_inspection_img rii on rit.objid = rii.task_id
+        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
+
         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>

ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html

@@ -30,7 +30,7 @@
         width: calc(48% - 2px);
         margin: 12px 1% 0 1%;
         border: 1px solid #1111;
-        height: 206px;
+        height: 180px;
     }
 
     .printList .item .card .left, .printList .item .card .right {

ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html

@@ -92,7 +92,7 @@
                     title: '主键',
                     visible: false
                 },
-        {
+                {
                     field: 'inspectionId',
                     title: 'id',
                     visible: false
@@ -113,6 +113,9 @@
                     formatter: function (value, row, index) {
                         return $.table.selectDictLabel(taskStateDatas, value);
                     }
+                }, {
+                    field: 'updateTime',
+                    title: '完成时间'
                 },
                 {
                     title: '操作',
@@ -137,7 +140,7 @@
 
 
     initinspectionTable = function (index, row, $detail) {
-        var [childTable,childTable1] = $detail.html('<div class="col-sm-12">\n' +
+        var [childTable, childTable1] = $detail.html('<div class="col-sm-12">\n' +
             '                <div class="tabs-container">\n' +
             '                    <ul class="nav nav-tabs">\n' +
             '                        <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true"> 第一个选项卡</a>\n' +
@@ -147,10 +150,10 @@
             '                    </ul>\n' +
             '                    <div class="tab-content">\n' +
             '                        <div id="tab-1" class="tab-pane active">\n' +
-            '<table class="table1" style="table-layout:fixed"></table>'+
+            '<table class="table1" style="table-layout:fixed"></table>' +
             '                        </div>\n' +
             '                        <div id="tab-2" class="tab-pane">\n' +
-            '<table style="table-layout:fixed"></table>'+
+            '<table style="table-layout:fixed"></table>' +
             '                        </div>\n' +
             '                    </div>\n' +
             '                </div>\n' +
@@ -165,13 +168,13 @@
             contentType: "application/x-www-form-urlencoded",
             queryParams: {
                 inspectionId: row.inspectionId,
-                locationCode:row.planePosition
+                locationCode: row.planePosition
             },
             columns: [
                 {
                     title: '序号',
                     formatter: function (value, row, index) {
-                        return index+1
+                        return index + 1
                     }
                 },
                 {
@@ -195,7 +198,8 @@
                     title: '提交时间'
                 }
 
-            ]});
+            ]
+        });
         $(childTable1).bootstrapTable({
             url: ctx + "manage/record_inspection_img/list",
             method: 'post',