diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index ca75a00c..1c993bf3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -186,6 +186,12 @@ public class LeaseApplyInfo extends BaseEntity { @Excel(name = "领料工程", sort = 3) private String projectName; + /** + * 领料物资名称汇总 + */ + @ApiModelProperty(value = "领料物资名称汇总") + private String maTypeNames; + /** * 预领料合计数 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java index 4e6ce118..059b6136 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java @@ -76,4 +76,6 @@ public interface LeaseApplyDetailsMapper { int updateLeaseApplyDetailsByLeaseOutRecord(@Param("record") LeaseOutDetails record); LeaseApplyDetails getOutboundNum(LeaseOutDetails record); + + String selectMaTypeNameByParentId(Long parentId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index e05866a5..b0679885 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -92,7 +92,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { */ @Override public List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) { - return leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); + List list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); + for (LeaseApplyInfo applyInfo : list) { + applyInfo.setMaTypeNames(leaseApplyDetailsMapper.selectMaTypeNameByParentId(applyInfo.getId())); + } + return list; } /** 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 f61195c3..3deba40e 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 @@ -194,4 +194,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM lease_apply_details WHERE id = #{id} AND (pre_num - IFNULL(al_num, 0)) > 0 + + \ No newline at end of file