修改 机位统计

master
wanghao 3 months ago
parent 15bac9f85f
commit 351979a41c

@ -60,6 +60,7 @@ public class RecordOutController extends BaseController
{ {
startPage(); startPage();
List<RecordOut> list = recordOutService.selectRecordOutList(recordOut); List<RecordOut> list = recordOutService.selectRecordOutList(recordOut);
return getDataTable(list); return getDataTable(list);
} }
/** /**
@ -99,6 +100,15 @@ public class RecordOutController extends BaseController
ExcelUtil<RecordOut> util = new ExcelUtil<RecordOut>(RecordOut.class); ExcelUtil<RecordOut> util = new ExcelUtil<RecordOut>(RecordOut.class);
return util.exportExcel(list, "轮挡出库记录数据"); return util.exportExcel(list, "轮挡出库记录数据");
} }
@PostMapping("/exportData")
@ResponseBody
public AjaxResult exportData(RecordOutSort recordOutSort)
{
List<RecordOutSort> list = recordOutService.selectRecordOutSortList(recordOutSort);
ExcelUtil<RecordOutSort> util = new ExcelUtil<>(RecordOutSort.class);
return util.exportExcel(list, "机位领用统计");
}
/** /**
* *
@ -156,4 +166,6 @@ public class RecordOutController extends BaseController
{ {
return toAjax(recordOutService.deleteRecordOutByObjids(ids)); return toAjax(recordOutService.deleteRecordOutByObjids(ids));
} }
} }

@ -17,6 +17,7 @@ public class RecordInspectionImg extends BaseEntity
/** 巡检id */ /** 巡检id */
@Excel(name = "巡检id") @Excel(name = "巡检id")
private Long objid;
private Long inspectionId; private Long inspectionId;
/** 任务表id */ /** 任务表id */
@ -31,6 +32,14 @@ public class RecordInspectionImg extends BaseEntity
@Excel(name = "路径") @Excel(name = "路径")
private String imgPath; private String imgPath;
public Long getObjid() {
return objid;
}
public void setObjid(Long objid) {
this.objid = objid;
}
public void setInspectionId(Long inspectionId) public void setInspectionId(Long inspectionId)
{ {
this.inspectionId = inspectionId; this.inspectionId = inspectionId;

@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.manage.mapper.RecordInspectionImgMapper"> <mapper namespace="com.ruoyi.manage.mapper.RecordInspectionImgMapper">
<resultMap type="RecordInspectionImg" id="RecordInspectionImgResult"> <resultMap type="RecordInspectionImg" id="RecordInspectionImgResult">
<result property="objid" column="objid" />
<result property="inspectionId" column="inspection_id" /> <result property="inspectionId" column="inspection_id" />
<result property="taskId" column="task_id" /> <result property="taskId" column="task_id" />
<result property="locationCode" column="location_code" /> <result property="locationCode" column="location_code" />
@ -14,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectRecordInspectionImgVo"> <sql id="selectRecordInspectionImgVo">
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
</sql> </sql>
<select id="selectRecordInspectionImgList" parameterType="RecordInspectionImg" resultMap="RecordInspectionImgResult"> <select id="selectRecordInspectionImgList" parameterType="RecordInspectionImg" resultMap="RecordInspectionImgResult">
@ -67,11 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteRecordInspectionImgByInspectionId" parameterType="Long"> <delete id="deleteRecordInspectionImgByInspectionId" parameterType="Long">
delete from record_inspection_img where inspection_id = #{inspectionId} delete from record_inspection_img where objid = #{objid}
</delete> </delete>
<delete id="deleteRecordInspectionImgByInspectionIds" parameterType="String"> <delete id="deleteRecordInspectionImgByInspectionIds" parameterType="String">
delete from record_inspection_img where inspection_id in delete from record_inspection_img where objid in
<foreach item="inspectionId" collection="array" open="(" separator="," close=")"> <foreach item="inspectionId" collection="array" open="(" separator="," close=")">
#{inspectionId} #{inspectionId}
</foreach> </foreach>

@ -97,7 +97,7 @@
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
detailView: true, detailView: true,
modalName: "轮挡批次入库记录", modalName: "轮挡批次入库统计",
exportUrl: prefix + "/export_sort", exportUrl: prefix + "/export_sort",
onExpandRow : function(index, row, $detail) { onExpandRow : function(index, row, $detail) {
initChildTable(index, row, $detail); initChildTable(index, row, $detail);

@ -18,23 +18,27 @@
<!-- <label>任务表id</label>--> <!-- <label>任务表id</label>-->
<!-- <input type="text" name="taskId"/>--> <!-- <input type="text" name="taskId"/>-->
<!-- </li>--> <!-- </li>-->
<li> <!-- <li>-->
<label>机位码:</label> <!-- <label>机位码:</label>-->
<input type="text" name="locationCode"/> <input type="hidden" name="locationCode" th:value="${location}"/>
</li> <!-- </li>-->
<li> <li>
<label>上传人:</label> <label>上传人:</label>
<input type="text" name="createBy"/> <input type="text" name="createBy"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>上传时间:</label> <label>上传时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="params[beginCreateTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间"
name="params[endCreateTime]"/>
</li> </li>
<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> </li>
</ul> </ul>
</div> </div>
@ -45,15 +49,21 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_inspection_img:edit">
<i class="fa fa-edit"></i> 修改 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
</a> shiro:hasPermission="manage:record_inspection_img:remove">
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection_img:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection_img:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="manage:record_inspection_img:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-warning multiple disabled" onclick="$.operate.edit()"
shiro:hasPermission="manage:record_inspection_img:edit">
<i class="fa fa-edit"></i> 下载
</a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -74,6 +84,7 @@
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "巡检历史图片", modalName: "巡检历史图片",
// queryParams: queryParams,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
@ -81,18 +92,24 @@
// field: 'inspectionId', // field: 'inspectionId',
// title: '巡检id' // title: '巡检id'
// }, // },
// {
// field: 'taskId',
// title: '任务表id'
// },
{ {
field: 'locationCode', field: 'objid',
title: '机位码', title: '主键',
visible: false visible: false
}, },
// {
// field: 'locationCode',
// title: '机位码',
// visible: false
// },
{ {
field: 'imgPath', field: 'imgPath',
title: '路径' title: '巡检图片',
formatter: function (value, row, index) {
return $.table.imageView(value, 818, 460, null);
}
}, },
{ {
field: 'createBy', field: 'createBy',
@ -107,14 +124,21 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.inspectionId + '\')"><i class="fa fa-edit"></i>编辑</a> '); // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.inspectionId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.inspectionId + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
}] }]
}; };
$.table.init(options); $.table.init(options);
}); });
function queryParams() {
console.log("查询")
var search = $.table.queryParams(params);
console.log(search)
return search;
}
</script> </script>
</body> </body>
</html> </html>

@ -20,10 +20,7 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 search-collapse">
<!-- 点击事件的方式打开使用 detailViewIcon: false and detailViewByClick: true
data-detail-view-icon="false"
data-detail-view-by-click="true" -->
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
@ -47,12 +44,19 @@
</ul> </ul>
</div> </div>
</form> </form>
</div>
<div class="col-sm-12 select-table table-striped">
<!-- 点击事件的方式打开使用 detailViewIcon: false and detailViewByClick: true
data-detail-view-icon="false"
data-detail-view-by-click="true" -->
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <i class="fa fa-info-circle" style="color: red;"></i> <!-- <i class="fa fa-info-circle" style="color: red;"></i>
勾选数据导出指定列,否则为全部--> 勾选数据导出指定列,否则为全部-->
<a class="btn btn-warning" onclick="exportSelected()"> <!-- <a class="btn btn-warning" onclick="exportSelected()">-->
<a class="btn btn-warning" onclick="$.table.exportExcel()">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -93,7 +97,8 @@
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
detailView: true, detailView: true,
modalName:"机位领用统计",
exportUrl: prefix + "/exportData",
onExpandRow : function(index, row, $detail) { onExpandRow : function(index, row, $detail) {
initChildTable(index, row, $detail); initChildTable(index, row, $detail);
}, },

Loading…
Cancel
Save