修改 巡检图片显示

ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java

@@ -191,13 +191,26 @@ public class ApiController {
         return success();
     }
 
+    /**
+     * 完成巡检
+     *
+     * @param tableId
+     * @param json
+     * @param inspectionId
+     * @param user
+     * @param files
+     * @return
+     */
     @PostMapping("/xj/submit")
-    public AjaxResult inspectionSubmit(long tableId, String json, long inspectionId, String user, List<MultipartFile> files) {
+    public AjaxResult inspectionSubmit(long tableId, String json, long inspectionId, String user,String locationCode, List<MultipartFile> files) {
         //插入 info 表
         List<StockDto> list = JSONObject.parseArray(json, StockDto.class);
-        String locationCode = list.get(0).getLocationCode();
+        if (list != null && !list.isEmpty()) {
+
             apiService.deleteInspectionInfo(locationCode, inspectionId);
             apiService.insertInspectionInfo(list, inspectionId);
+        }
+
         //修改task状态
         apiService.updataInspectionTaskByObjid(tableId, null, "已完成");
 

ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java

@@ -1,6 +1,11 @@
 package com.ruoyi.manage.controller;
 
 import java.util.List;
+
+import com.ruoyi.manage.domain.RecordInspectionImg;
+import com.ruoyi.manage.domain.RecordInspectionInfo;
+import com.ruoyi.manage.service.IRecordInspectionImgService;
+import com.ruoyi.manage.service.IRecordInspectionInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -27,33 +32,45 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @Controller
 @RequestMapping("/manage/record_inspection")
-public class RecordInspectionController extends BaseController
+public class RecordInspectionController extends BaseController {
-{
     private String prefix = "manage/record_inspection";
-
+    @Autowired
+    private IRecordInspectionInfoService recordInspectionInfoService;
+    @Autowired
+    private IRecordInspectionImgService recordInspectionImgService;
     @Autowired
     private IRecordInspectionService recordInspectionService;
 
     @RequiresPermissions("manage:record_inspection:view")
     @GetMapping()
-    public String record_inspection()
+    public String record_inspection() {
-    {
         return prefix + "/record_inspection";
     }
+
     @GetMapping("/imgGroup")
-    public String record_img()
+    public String record_img() {
-    {
         return prefix + "/record_img_group";
     }
 
+    @GetMapping("/print")
+    public String print(String ids) {
+        System.out.println(ids);
+
+        List<RecordInspectionInfo> list=recordInspectionInfoService.selectInfoByInspectionId(ids);
+        System.out.println("巡检记录"+list.size());
+        List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids);
+        System.out.println("巡检图片"+recordInspectionImgs.size());
+        return prefix +"";
+    }
+
+
     /**
      * 查询巡检记录列表
      */
     @RequiresPermissions("manage:record_inspection:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(RecordInspection recordInspection)
+    public TableDataInfo list(RecordInspection recordInspection) {
-    {
         startPage();
         List<RecordInspection> list = recordInspectionService.selectRecordInspectionList(recordInspection);
         return getDataTable(list);
@@ -66,8 +83,7 @@ public class RecordInspectionController extends BaseController
     @Log(title = "巡检记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(RecordInspection recordInspection)
+    public AjaxResult export(RecordInspection recordInspection) {
-    {
         List<RecordInspection> list = recordInspectionService.selectRecordInspectionList(recordInspection);
         ExcelUtil<RecordInspection> util = new ExcelUtil<RecordInspection>(RecordInspection.class);
         return util.exportExcel(list, "巡检记录数据");
@@ -77,8 +93,7 @@ public class RecordInspectionController extends BaseController
      * 新增巡检记录
      */
     @GetMapping("/add")
-    public String add()
+    public String add() {
-    {
         return prefix + "/add";
     }
 
@@ -89,8 +104,7 @@ public class RecordInspectionController extends BaseController
     @Log(title = "巡检记录", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(RecordInspection recordInspection)
+    public AjaxResult addSave(RecordInspection recordInspection) {
-    {
         return toAjax(recordInspectionService.insertRecordInspection(recordInspection));
     }
 
@@ -99,8 +113,7 @@ public class RecordInspectionController extends BaseController
      */
     @RequiresPermissions("manage:record_inspection:edit")
     @GetMapping("/edit/{inspectionId}")
-    public String edit(@PathVariable("inspectionId") Long inspectionId, ModelMap mmap)
+    public String edit(@PathVariable("inspectionId") Long inspectionId, ModelMap mmap) {
-    {
         RecordInspection recordInspection = recordInspectionService.selectRecordInspectionByInspectionId(inspectionId);
         mmap.put("recordInspection", recordInspection);
         return prefix + "/edit";
@@ -113,8 +126,7 @@ public class RecordInspectionController extends BaseController
     @Log(title = "巡检记录", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(RecordInspection recordInspection)
+    public AjaxResult editSave(RecordInspection recordInspection) {
-    {
         return toAjax(recordInspectionService.updateRecordInspection(recordInspection));
     }
 
@@ -125,8 +137,7 @@ public class RecordInspectionController extends BaseController
     @Log(title = "巡检记录", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
+    public AjaxResult remove(String ids) {
-    {
         return toAjax(recordInspectionService.deleteRecordInspectionByInspectionIds(ids));
     }
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java

@@ -61,4 +61,6 @@ public interface RecordInspectionImgMapper
     public int deleteRecordInspectionImgByInspectionIds(String[] inspectionIds);
 
     List<RecordInspectionImg> selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg);
+
+    List<RecordInspectionImg> recordInspectionImgMapper(String[] strArray);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionInfoMapper.java

@@ -59,4 +59,6 @@ public interface RecordInspectionInfoMapper
      * @return 结果
      */
     public int deleteRecordInspectionInfoByInspectionIds(String[] inspectionIds);
+
+    List<RecordInspectionInfo> selectInfoByInspectionId(String[] inspectionIds);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java

@@ -60,4 +60,6 @@ public interface IRecordInspectionImgService
     public int deleteRecordInspectionImgByInspectionId(Long inspectionId);
 
     List<RecordInspectionImg> selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg);
+
+    List<RecordInspectionImg> selectImgByInspectionId(String ids);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionInfoService.java

@@ -58,4 +58,6 @@ public interface IRecordInspectionInfoService
      * @return 结果
      */
     public int deleteRecordInspectionInfoByInspectionId(Long inspectionId);
+
+    List<RecordInspectionInfo> selectInfoByInspectionId(String ids);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java

@@ -100,4 +100,9 @@ public class RecordInspectionImgServiceImpl implements IRecordInspectionImgServi
     public List<RecordInspectionImg> selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg) {
         return recordInspectionImgMapper.selectRecordInspectionlocationList( recordInspectionImg);
     }
+
+    @Override
+    public List<RecordInspectionImg> selectImgByInspectionId(String ids) {
+        return recordInspectionImgMapper.recordInspectionImgMapper(Convert.toStrArray(ids));
+    }
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionInfoServiceImpl.java

@@ -109,4 +109,9 @@ public class RecordInspectionInfoServiceImpl implements IRecordInspectionInfoSer
     public int deleteRecordInspectionInfoByInspectionId(Long inspectionId) {
         return recordInspectionInfoMapper.deleteRecordInspectionInfoByInspectionId(inspectionId);
     }
+
+    @Override
+    public List<RecordInspectionInfo> selectInfoByInspectionId(String ids) {
+        return recordInspectionInfoMapper.selectInfoByInspectionId(Convert.toStrArray(ids));
+    }
 }

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

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+
     <select id="selectRecordInspectionlocationList" parameterType="RecordInspectionImg" resultMap="RecordInspectionImgResult">
         select location_code
         from record_inspection_img
@@ -88,4 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by location_code order by location_code
     </select>
 
+    <select id="recordInspectionImgMapper"  resultMap="RecordInspectionImgResult">
+        <include refid="selectRecordInspectionImgVo"/>
+        where inspection_id in
+        <foreach item="inspectionId" collection="array" open="(" separator="," close=")">
+            #{inspectionId}
+        </foreach>
+    </select>
+
+
 </mapper>

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

@@ -73,4 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="selectInfoByInspectionId" resultMap="RecordInspectionInfoResult">
+        <include refid="selectRecordInspectionInfoVo"/>
+        where inspection_id in
+        <foreach item="inspectionId" collection="array" open="(" separator="," close=")">
+            #{inspectionId}
+        </foreach>
+    </select>
+
 </mapper>

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

@@ -12,9 +12,11 @@
                     <ul>
                         <li class="select-time">
                             <label>巡检时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginInspectionTime]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginInspectionTime]"/>
                             <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endInspectionTime]"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endInspectionTime]"/>
                         </li>
 
                         <!--                            <li>-->
@@ -22,8 +24,10 @@
                         <!--                                <input type="text" name="inspectionUser"/>-->
                         <!--                            </li>-->
                         <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
                 </div>
@@ -34,15 +38,21 @@
             <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection:add">-->
             <!--                    <i class="fa fa-plus"></i> 添加-->
             <!--                </a>-->
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_inspection:edit">
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="manage:record_inspection:edit">
                 <i class="fa fa-edit"></i> 修改
             </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection:remove">
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="manage:record_inspection:remove">
                 <i class="fa fa-remove"></i> 删除
             </a>
-<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection:export">-->
+            <a class="btn">
-<!--                    <i class="fa fa-download"></i> 导出-->
+
-<!--                </a>-->
+            </a>
+
+            <a class="btn btn-success multiple disabled" onclick="checkItem()">
+                <i class="fa fa-print"></i> 打印
+            </a>
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -65,11 +75,14 @@
             modalName: "巡检记录",
             sortOrder: "desc",
             sortName: "inspectionTime",
+            rememberSelected: true,
             detailView: true,
             onExpandRow: function (index, row, $detail) {
                 initinspectionTable(index, row, $detail);
             },
             columns: [{
+
+                field: 'state',
                 checkbox: true
             },
                 {
@@ -120,11 +133,13 @@
     function openTaskTable(id) {
         $.modal.openTab('巡检机位情况', ctx + "manage/record_inspection_task/" + id);
     }
+
     initinspectionTable = function (index, row, $detail) {
         var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
 
         $(childTable).bootstrapTable({
             url: ctx + "manage/record_inspection_info/list",
+
             method: 'post',
             sidePagination: "server",
             contentType: "application/x-www-form-urlencoded",
@@ -132,6 +147,8 @@
                 inspectionId: row.inspectionId
             },
             columns: [
+
+
                 {
                     title: '序号',
                     formatter: function (value, row, index) {
@@ -162,6 +179,15 @@
             ]
         });
     };
+
+    // 选中数据
+    function checkItem() {
+        var arrays = $.table.selectColumns("inspectionId");
+        // alert(arrays);
+        var data = {"ids": arrays.toString()};
+        $.operate.submit(prefix + "/print", "get", "json", data);
+    }
+
 </script>
 </body>
 </html>