diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java index 408c511..bdb77ba 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java @@ -45,4 +45,6 @@ public interface MaDevQcMapper { List selectQcList(MaDevQc maDevQc); List getQcList(Long maId); + + MaDevQc getQcListByOne(Long maId); } 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 9d774fb..fc01a2d 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 @@ -108,9 +108,11 @@ public class DevInfoServiceImpl implements DevInfoService { } BmFileInfo bmFileInfo = new BmFileInfo().setModelId(devInfoVo.getMaId()).setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); List fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); + ArrayList tableList = new ArrayList<>(); if (!CollectionUtils.isEmpty(fileList)) { fileList.removeIf(Objects::isNull); fileList.forEach(item -> { + Table table = new Table(); if (item.getFileType().equals(Long.valueOf(MAIN_IMAGES_DICT_VALUE))) { devInfoVo.getMainFileList().add(item); } else if (item.getFileType().equals(Long.valueOf(DETAILS_IMAGES_DICT_VALUE))) { @@ -120,8 +122,19 @@ public class DevInfoServiceImpl implements DevInfoService { } else if (item.getFileType().equals(Long.valueOf(INSURANCE_PDF))) { devInfoVo.getInsurancePdf().add(item); } + }); } + Table table = new Table(); + table.setExaminationPdf(devInfoVo.getExaminationPdf()); + table.setInsurancePdf(devInfoVo.getInsurancePdf()); + MaDevQc qc = maDevQcMapper.getQcListByOne(maId); + table.setIdentifyCode(devInfoVo.getIdentifyCode()); + table.setCheckMan(qc.getQcUser()); + table.setCheckDate(qc.getQcTime()); + table.setNextCheckDate(qc.getNextCheckTime()); + tableList.add(table); + devInfoVo.setTableList(tableList); bmFileInfo.setFileType(0L); List mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); if (!CollectionUtils.isEmpty(mainFileInfoList)) { 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 beb972f..5ecc5f1 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 @@ -122,5 +122,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdc.ma_id = #{maId} LIMIT 10 +