From 3a0500117e195bbc4e87d59da270bb77291b9356 Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 22 Dec 2025 09:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/devchange/domain/DevChangeVo.java | 2 ++ .../bonus/material/toolLedger/domain/ToolLedgerAllEntity.java | 2 +- .../resources/mapper/material/devchange/DevChangeMapper.xml | 2 ++ .../resources/mapper/material/devchange/MaDevInfoMapper.xml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/DevChangeVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/DevChangeVo.java index 149e9c4..cae104b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/DevChangeVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/DevChangeVo.java @@ -132,6 +132,8 @@ public class DevChangeVo { @Excel(name = "使用到期日期结束",width = 25 ,sort = 7) private LocalDate useEndTime; + private LocalDate useTime; + private Integer workingHours; @Excel(name = "最大使用年限",width = 25 ,sort = 8) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerAllEntity.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerAllEntity.java index e357899..8498669 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerAllEntity.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerAllEntity.java @@ -111,7 +111,7 @@ public class ToolLedgerAllEntity implements Serializable { /** * 出厂日期 */ - @Excel(name = "出厂日期", sort = 10) + //@Excel(name = "出厂日期", sort = 10) private LocalDate productionDate; /** diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 816fc9d..8704f2b 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -240,6 +240,7 @@ dcd.num as devNum, dcd.use_start_time as useStartTime, dcd.use_end_time as useEndTime, + dcd.use_time as useTime, bci.company_name compName, bci.operate_address orgName, IFNULL(pro.pro_name, '-') proName, @@ -282,6 +283,7 @@ dcd.num AS devNum, dcd.use_start_time AS useStartTime, dcd.use_end_time AS useEndTime, + dcd.use_time as useTime, bci.company_name AS compName, bci.operate_address AS orgName, -- 工具无项目关联，默认显示'-' diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml index ffeea52..a7f44c7 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml @@ -330,7 +330,7 @@ mdi.device_name AS name, mdi.item_type_model As specificationModel, mdi.code AS code, - mdi.expirationTime as expirationTime + mdi.expiration_time as expirationTime, mdi.up_down_status AS upDownStatus, mdi.change_status AS status, TIMESTAMPDIFF(YEAR, mdi.production_date, CURDATE()) AS serviceLife,