diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java index 4697269..98bcc3d 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java @@ -60,6 +60,7 @@ public class RecordOutController extends BaseController { startPage(); List list = recordOutService.selectRecordOutList(recordOut); + return getDataTable(list); } /** @@ -99,6 +100,15 @@ public class RecordOutController extends BaseController ExcelUtil util = new ExcelUtil(RecordOut.class); return util.exportExcel(list, "轮挡出库记录数据"); } + @PostMapping("/exportData") + @ResponseBody + public AjaxResult exportData(RecordOutSort recordOutSort) + { + + List list = recordOutService.selectRecordOutSortList(recordOutSort); + ExcelUtil util = new ExcelUtil<>(RecordOutSort.class); + return util.exportExcel(list, "机位领用统计"); + } /** * 新增轮挡出库记录 @@ -156,4 +166,6 @@ public class RecordOutController extends BaseController { return toAjax(recordOutService.deleteRecordOutByObjids(ids)); } + + } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java index 29aebfd..d60d3ca 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java @@ -17,6 +17,7 @@ public class RecordInspectionImg extends BaseEntity /** 巡检id */ @Excel(name = "巡检id") + private Long objid; private Long inspectionId; /** 任务表id */ @@ -31,7 +32,15 @@ public class RecordInspectionImg extends BaseEntity @Excel(name = "路径") private String imgPath; - public void setInspectionId(Long inspectionId) + public Long getObjid() { + return objid; + } + + public void setObjid(Long objid) { + this.objid = objid; + } + + public void setInspectionId(Long inspectionId) { this.inspectionId = inspectionId; } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml index 532e836..c53ab2e 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -14,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select inspection_id, task_id, location_code, img_path, create_by, create_time from record_inspection_img + select objid,inspection_id, task_id, location_code, img_path, create_by, create_time from record_inspection_img - -
  • - - -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • - - - - +
    +
    +
    +
    +
    +
      + + + + + + + + + + + + +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    - - + { + title: '操作', + align: 'center', + formatter: function (value, row, index) { + var actions = []; + // actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } + }] + }; + $.table.init(options); + }); + + function queryParams() { + console.log("查询") + var search = $.table.queryParams(params); + console.log(search) + return search; + } + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html b/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html index 67cfa39..473879f 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html @@ -20,10 +20,7 @@
    -
    - +
      @@ -47,12 +44,19 @@
    + +
    +
    +
    @@ -93,7 +97,8 @@ showToggle: false, showColumns: false, detailView: true, - + modalName:"机位领用统计", + exportUrl: prefix + "/exportData", onExpandRow : function(index, row, $detail) { initChildTable(index, row, $detail); },