diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java index 00fbf023..b26105d9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java @@ -42,6 +42,24 @@ public class SltAgreementInfo extends BaseEntity { @ApiModelProperty(value = "机具规格id") private Long typeId; + /** + * 设备名称 + */ + private String typeName; + /** + * 规格型号 + */ + private String modelName; + + /** + * 计量单位 + */ + private String mtUnitName; + /** + * 租赁天数 + */ + private String leaseDays; + /** 机具id */ @Excel(name = "机具id") @ApiModelProperty(value = "机具id") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index bbdd5b1d..56bc9872 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.ma_id as maId, mt1.type_name as typeName, mt.type_name as modelName, - mt.unit_name as nuitName, + mt.unit_name as mtUnitName, sai.lease_price as leasePrice, sai.num as num, DATE(sai.start_time) as startTime, @@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rc.ma_id as maId, mt1.type_name as typeName, mt.type_name as modelName, - mt.unit_name as nuitName, + mt.unit_name as mtUnitName, rc.repair_num as num, rc.costs as costs, case rc.repair_type when '1' then '内部维修' when '2' then '返厂维修' else '' end as partType, @@ -274,7 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sad.ma_id as maId, mt1.type_name as typeName, mt.type_name as modelName, - mt.unit_name as nuitName, + mt.unit_name as mtUnitName, sum(sad.scrap_num) as num, mt.buy_price as buyPrice, case sad.scrap_type when '0' then '自然' when '1' then '人为' else '' end as scrapType, @@ -306,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.ma_id as maId, mt1.type_name as typeName, mt.type_name as modelName, - mt.unit_name as nuitName, + mt.unit_name as mtUnitName, sai.buy_price as buyPrice, sai.num as num, sai.start_time as startTime,