wangh
/
beijing_daxing_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 机位统计

Browse Source
master
wanghao 2 months ago
parent 15bac9f85f
commit 351979a41c
6 changed files with 154 additions and 103 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java
Unescape Escape View File

@ -60,6 +60,7 @@ public class RecordOutController extends BaseController
{
startPage();
List<RecordOut> list = recordOutService.selectRecordOutList(recordOut);
return getDataTable(list);
}
/**
@ -99,6 +100,15 @@ public class RecordOutController extends BaseController
ExcelUtil<RecordOut> util = new ExcelUtil<RecordOut>(RecordOut.class);
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));
}
}

11
ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java
Unescape Escape View File

@ -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;
}

7
ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml
Unescape Escape View File

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

2
ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
Unescape Escape View File

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

208
ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html
Unescape Escape View File

@ -1,98 +1,115 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('巡检历史图片列表')" />
<th:block th:include="include :: header('巡检历史图片列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<!-- <li>-->
<!-- <label>巡检id：</label>-->
<!-- <input type="text" name="inspectionId"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>任务表id：</label>-->
<!-- <input type="text" name="taskId"/>-->
<!-- </li>-->
<li>
<label>机位码：</label>
<input type="text" name="locationCode"/>
</li>
<li>
<label>上传人：</label>
<input type="text" name="createBy"/>
</li>
<li class="select-time">
<label>上传时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</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-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<!-- <li>-->
<!-- <label>巡检id：</label>-->
<!-- <input type="text" name="inspectionId"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>任务表id：</label>-->
<!-- <input type="text" name="taskId"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>机位码：</label>-->
<input type="hidden" name="locationCode" th:value="${location}"/>
<!-- </li>-->
<li>
<label>上传人：</label>
<input type="text" name="createBy"/>
</li>
<li class="select-time">
<label>上传时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
name="params[endCreateTime]"/>
</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-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
shiro:hasPermission="manage:record_inspection_img:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="manage:record_inspection_img:export">
<i class="fa fa-download"></i> 导出
</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 class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add">
<i class="fa fa-plus"></i> 添加
</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>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection_img:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection_img:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manage:record_inspection_img:edit')}]];
var removeFlag = [[${@permission.hasPermi('manage:record_inspection_img:remove')}]];
var prefix = ctx + "manage/record_inspection_img";
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manage:record_inspection_img:edit')}]];
var removeFlag = [[${@permission.hasPermi('manage:record_inspection_img:remove')}]];
var prefix = ctx + "manage/record_inspection_img";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "巡检历史图片",
columns: [{
checkbox: true
},
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "巡检历史图片",
// queryParams: queryParams,
columns: [{
checkbox: true
},
// {
// field: 'inspectionId',
// title: '巡检id'
// },
// {
// field: 'taskId',
// title: '任务表id'
// },
{
field: 'locationCode',
title: '机位码',
visible:false
field: 'objid',
title: '主键',
visible: false
},
// {
// field: 'locationCode',
// title: '机位码',
// visible: false
// },
{
field: 'imgPath',
title: '路径'
title: '巡检图片',
formatter: function (value, row, index) {
return $.table.imageView(value, 818, 460, null);
}
},
{
field: 'createBy',
@ -102,19 +119,26 @@
field: 'createTime',
title: '上传时间'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
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-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.inspectionId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
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-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
function queryParams() {
console.log("查询")
var search = $.table.queryParams(params);
console.log(search)
return search;
}
</script>
</body>
</html>

17
ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html
Unescape Escape View File

@ -20,10 +20,7 @@
<body class="gray-bg">
<div class="container-div">
<div class="row">
<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" -->
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
@ -47,12 +44,19 @@
</ul>
</div>
</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>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<!-- <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> 导出
</a>
</div>
@ -93,7 +97,8 @@
showToggle: false,
showColumns: false,
detailView: true,
modalName:"机位领用统计",
exportUrl: prefix + "/exportData",
onExpandRow : function(index, row, $detail) {
initChildTable(index, row, $detail);
},

Write Preview
Loading…
Cancel
Save