diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index 7619c7cd..f69f2587 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -27,11 +27,26 @@ public class LeaseApplyDetails extends BaseEntity { @ApiModelProperty(value = "任务ID") private Long parentId; - /** 规格ID */ - @Excel(name = "规格ID") - @ApiModelProperty(value = "规格ID") + /** 物资类型 */ + @ApiModelProperty(value = "物资类型名称") + private String maTypeName; + + /** 规格型号id */ + @ApiModelProperty(value = "规格型号id") private Long typeId; + /** 规格型号 */ + @ApiModelProperty(value = "规格型号名称") + private String typeName; + + /** 计量单位 */ + @ApiModelProperty(value = "计量单位") + private String unitName; + + /** 库存数量 */ + @ApiModelProperty(value = "库存数量") + private String storageNum; + /** 预领料数 */ @Excel(name = "预领料数") @ApiModelProperty(value = "预领料数") 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 c03ca030..c7619d26 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 @@ -7,6 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -26,10 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - lad.id, lad.parent_id, lad.type_id, lad.pre_num, lad.audit_num, lad.al_num, lad.status, + lad.id, lad.parent_id, mt.type_id, mt.type_name, mt2.type_name as ma_type_name, mt.storage_num, + lad.pre_num, lad.audit_num, lad.al_num, lad.status, mt.unit_name, lad.create_by, lad.create_time, lad.update_by, lad.update_time, lad.remark, lad.company_id from lease_apply_details lad + left join + ma_type mt on lad.type_id = mt.type_id and mt.`level` = '4' and mt.del_flag = '0' + left join + ma_type mt2 on mt2.type_id = mt.parent_id and mt2.`level` = '3' and mt2.del_flag = '0'