From 55ce855d68df52fd8d477625862bb6e19842301e Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 26 Dec 2024 14:38:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/domain/lease/LeaseOutDetails.java | 3 +++ .../lease/service/impl/LeaseOutDetailsServiceImpl.java | 7 ------- .../mapper/material/lease/LeaseApplyDetailsMapper.xml | 5 ++++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java index 1bd72c45..4c7cb59f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java @@ -48,6 +48,9 @@ public class LeaseOutDetails extends BaseEntity { @ApiModelProperty(value = "机具状态") private String maStatus; + @ApiModelProperty(value = "机具状态名称") + private String statusName; + @ApiModelProperty(value = "二维码code") private String qrCode; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index a0d3a61b..f032d552 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -170,14 +170,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { record.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId()); } else if (record.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) { record.setOutType(InputOutEnum.CODE_DEVICE.getTypeId()); - } else if (record.getManageType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) { - // 标准箱 - record.setOutType(InputOutEnum.STANDARD_BOX.getTypeId()); - } else if (record.getManageType().equals(InputOutEnum.QR_CODE.getTypeId())) { - // 二维码 - record.setOutType(InputOutEnum.QR_CODE.getTypeId()); } - res = checkStorageNum(record); if (res > 0) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index e6ca4cb2..9c8e2c4e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -243,7 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mm.ma_code as maCode, mm.type_id as typeId, mm.ma_status as maStatus, - mm.qr_code as qrCode + mm.qr_code as qrCode, + case when mm.ma_status = '1' then '在库' + else '' + end as statusName FROM ma_machine mm LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0' LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'