diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index f1cd184..418aaf8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -31,7 +31,14 @@ public class BmContractServiceImpl implements BmContractService { @Override public List list(BmContract bmContract) { bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - return bmContractMapper.list(bmContract); + List list = bmContractMapper.list(bmContract); + for (BmContract contract : list) { + BmFileInfo bmFileInfo = new BmFileInfo(); + bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); + List bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); + contract.setBmFileInfoList(bmFileInfos); + } + return list; } @Override diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index 35dec01..e81efc4 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and contract_name like concat('%', #{contractName}, '%') + + and status = #{status} +