From 5ab0b7d3ebaf53f549a7dc3dcc8895f1b6de87a5 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 21 Nov 2024 15:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=A7=9F=E8=B5=81=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E5=A4=87=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjUsingRecordController.java | 11 ++ .../mapper/ProjUsingRecordMapper.java | 2 + .../service/ProjUsingRecordService.java | 2 + .../impl/ProjUsingRecordServiceImpl.java | 5 + .../mapper/material/ProjUsingRecordMapper.xml | 37 +++++ sgzb-ui/src/api/stquery/deviceStatusRecord.js | 8 ++ sgzb-ui/src/views/stquery/projUsingRecord.vue | 133 +++++++++++++++++- 7 files changed, 196 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java index a506257e..5dd14d45 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java @@ -56,4 +56,15 @@ public class ProjUsingRecordController extends BaseController { util.exportExcel(response, list, "综合查询--工程机具使用"); } + /** + * 历史租赁总数编码设备详情 + */ + @ApiOperation(value = "综合查询--工程机具使用列表") + @GetMapping("/getHisCodeRecord") + public AjaxResult getHisCodeRecord(ProjUsingRecord bean) { + startPage(); + List list = projUsingRecordService.getHisCodeRecord(bean); + return AjaxResult.success(getDataTable(list)); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java index 9674ea37..bc69fb0a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java @@ -20,4 +20,6 @@ public interface ProjUsingRecordMapper { * @return List */ List getProjUsingRecordList(ProjUsingRecord bean); + + List getHisCodeRecord(ProjUsingRecord bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java index ca0d9666..255b79d4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java @@ -18,4 +18,6 @@ public interface ProjUsingRecordService { * @return List */ List getProjUsingRecordList(ProjUsingRecord bean); + + List getHisCodeRecord(ProjUsingRecord bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java index bee4a8bc..2877afeb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java @@ -26,4 +26,9 @@ public class ProjUsingRecordServiceImpl implements ProjUsingRecordService { public List getProjUsingRecordList(ProjUsingRecord bean) { return projUsingRecordMapper.getProjUsingRecordList(bean); } + + @Override + public List getHisCodeRecord(ProjUsingRecord bean) { + return projUsingRecordMapper.getHisCodeRecord(bean); + } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml index 5210c861..8b998d39 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml @@ -8,10 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT subquery1.agreementCode, subquery1.unitName, subquery1.proName, + subquery1.unitId, + subquery1.type_id as typeId, + subquery1.proId, subquery1.typeName, subquery1.typeModelName, subquery1.unit, subquery3.typeKeepName, + CASE WHEN subquery1.manage_type = '0' then '编码' else '数量' end as manageTypeName, IFNULL(subquery1.outNum, 0) as outNum, IFNULL(subquery2.backNum, 0) as backNum, CASE @@ -31,9 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM (SELECT bai.agreement_id, mt.type_id, mt.rent_price, + mt.manage_type, bai.agreement_code AS agreementCode, bui.unit_name AS unitName, + bui.unit_id AS unitId, bpl.lot_name AS proName, + bpl.lot_id AS proId, mt2.type_name AS typeName, mt.type_name AS typeModelName, mt.unit_name AS unit, @@ -138,4 +145,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE LOCATE(#{userId}, subquery3.userIds) > 0 + \ No newline at end of file diff --git a/sgzb-ui/src/api/stquery/deviceStatusRecord.js b/sgzb-ui/src/api/stquery/deviceStatusRecord.js index 747f968a..331a731d 100644 --- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js +++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js @@ -70,6 +70,14 @@ export function getAllRecords(query) { params: query }) } +// 获取 总保有量编码设备 +export function getHisCodeRecords(query) { + return request({ + url: '/material/projUsingRecord/getHisCodeRecord', + method: 'get', + params: query + }) +} diff --git a/sgzb-ui/src/views/stquery/projUsingRecord.vue b/sgzb-ui/src/views/stquery/projUsingRecord.vue index 2756d572..a51bdba4 100644 --- a/sgzb-ui/src/views/stquery/projUsingRecord.vue +++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue @@ -188,6 +188,12 @@ prop="unit" :show-overflow-tooltip="true" /> + + > + + + + + + + + + + + + 查询 + + + + + + + + + + + + + @@ -233,7 +327,7 @@ import { getProData, usingRecord, } from '@/api/stquery/projUsingRecord' -import {getTypeKeeper} from "@/api/stquery/deviceStatusRecord"; +import {getAllRecords, getHisCodeRecords, getTypeKeeper} from "@/api/stquery/deviceStatusRecord"; export default { name: 'backRecord', @@ -252,10 +346,19 @@ export default { showSearch: true, // 总条数 total: 0, + openHisCodeRecord: false, // 字典表格数据 leaseAuditList: [], // 日期范围 dateRange: [], + dialogQuery: { + pageNum: 1, + pageSize: 10, + typeId: undefined, + maCode: undefined, + unitId: undefined, + proId: undefined, + }, // 查询参数 queryParams: { pageNum: 1, @@ -272,6 +375,7 @@ export default { }, unitList: [], //来往单位集合 keepIdList: [], //库管员id集合 + HisCodeRecords: [], //历史租赁设备列表 proList: [], //工程集合 } }, @@ -348,6 +452,11 @@ export default { this.queryParams.pageNum = 1 this.getList() }, + /** 搜索历史租赁设备按钮*/ + handleGetHisCodeRecord() { + this.queryParams.pageNum = 1 + this.getHisCodeRecords() + }, /** 重置按钮操作 */ resetQuery() { this.getProList() @@ -375,6 +484,22 @@ export default { keepUserChange(val) { this.getTypeKeeper(val) }, + //查看历史租赁编码设备 + openHisCodeRecords(row) { + this.openHisCodeRecord = true + this.dialogQuery.maCode = "" + this.dialogQuery.typeId= row.typeId + this.dialogQuery.unitId= row.unitId + this.dialogQuery.proId= row.proId + this.getHisCodeRecords() + }, + /** 查看历史租赁编码设备 */ + getHisCodeRecords() { + getHisCodeRecords(this.dialogQuery).then((response) => { + this.HisCodeRecords = response.data.rows + this.dialogTotal = response.data.total + }) + }, // 获取 库管员 async getTypeKeeper() { const params = { @@ -393,4 +518,8 @@ export default { width: 60px !important; margin-bottom: 10px; } +.clickText { + color: #02a7f0; + cursor: pointer; +}