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 65d1065..93c1bfe 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 @@ -2,6 +2,7 @@ package com.bonus.material.device.mapper; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.TypeInfo; +import com.bonus.material.device.domain.MaDevQc; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -83,4 +84,6 @@ public interface BmFileInfoMapper { String getUrlById(Integer fileId); Integer deleteBmFileInfoByFileId(@Param("fileId") Integer fileId, @Param("fileType") Integer fileType); + + BmFileInfo getInfoByMaIdAndTaskId(MaDevQc qc); } 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 b866a86..905663a 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 @@ -116,9 +116,9 @@ public class DevInfoServiceImpl implements DevInfoService { devInfoVo.getMainFileList().add(item); } else if (item.getFileType().equals(Long.valueOf(DETAILS_IMAGES_DICT_VALUE))) { devInfoVo.getDetailsFileList().add(item); - } else if (item.getFileType().equals(Long.valueOf(EXAMINATION_PDF))) { + } /*else if (item.getFileType().equals(Long.valueOf(EXAMINATION_PDF))) { devInfoVo.getExaminationPdf().add(item); - } else if (item.getFileType().equals(Long.valueOf(INSURANCE_PDF))) { + }*/ else if (item.getFileType().equals(Long.valueOf(INSURANCE_PDF))) { devInfoVo.getInsurancePdf().add(item); } @@ -134,6 +134,7 @@ public class DevInfoServiceImpl implements DevInfoService { table.setId(qc.getId()); table.setCheckDate(qc.getQcTime()); table.setNextCheckDate(qc.getNextCheckTime()); + devInfoVo.getExaminationPdf().add(bmFileInfoMapper.getInfoByMaIdAndTaskId(qc)); } tableList.add(table); devInfoVo.setTableList(tableList); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java index 96a60cd..e875669 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java @@ -145,7 +145,7 @@ public class MaDevQcServiceImpl implements MaDevQcService { public Integer deleteById(MaDevQc maDevQc) { int i = maDevQcMapper.deleteDevQcByFileId(maDevQc.getFileId()); if (i > 0) { - bmFileInfoMapper.deleteBmFileInfoByMaId(maDevQc.getFileId(),4); + bmFileInfoMapper.deleteBmFileInfoByFileId(maDevQc.getFileId(),4); } return i; } 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 4c297be..ab466c5 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 @@ -63,6 +63,16 @@ 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 7c549ac..4ebd06a 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 @@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mdc.id, mdc.qc_time, + mdc.ma_id, mt.maintenance_alarm_day, mdc.qc_user, mdc.next_check_time,