diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java index 8728279..31848cd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java @@ -66,6 +66,9 @@ public class MaDevQc extends BaseEntity implements Serializable { @ApiModelProperty(value = "附件信息") private List fileInfoList; + @ApiModelProperty(value = "附件信息") + private BmFileInfo fileInfo; + @ApiModelProperty(value = "附件地址") private String url; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java index e344c22..5d04438 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java @@ -27,6 +27,7 @@ public interface BmFileInfoMapper { * @return 附件集合 */ List selectBmFileInfoList(BmFileInfo bmFileInfo); + BmFileInfo selectBmFileInfo(BmFileInfo bmFileInfo); /** * 新增附件 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index dd4d122..0f90f6c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -167,6 +167,15 @@ public class DevInfoServiceImpl implements DevInfoService { //查询质检记录 List qcList = maDevQcMapper.getQcList(maId); + for (MaDevQc maDevQc : qcList) { + BmFileInfo fileInfo = new BmFileInfo(); + fileInfo.setTaskId(Long.valueOf(maDevQc.getId())); + fileInfo.setModelId(Long.valueOf(maDevQc.getMaId())); + fileInfo.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); + fileInfo.setFileType(4L); + BmFileInfo bmFileInfos = bmFileInfoMapper.selectBmFileInfo(fileInfo); + maDevQc.setFileInfo(bmFileInfos); + } devInfoVo.setQcList(qcList); } return devInfoVo; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml index 11a6c39..5ccf15f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml @@ -41,6 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into bm_file_info diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index a7605c9..2fc3bcd 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -119,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"