bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

装备编辑回显装备证书

This commit is contained in:
liang.chao 2024-12-20 17:56:14 +08:00
parent d5986d572a
commit 18569b3b13
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
View File

@ -45,4 +45,6 @@ public interface MaDevQcMapper {
List<MaDevQc> selectQcList(MaDevQc maDevQc);
List<MaDevQc> getQcList(Long maId);
MaDevQc getQcListByOne(Long maId);
}

13
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
View File

@ -108,9 +108,11 @@ public class DevInfoServiceImpl implements DevInfoService {
}
BmFileInfo bmFileInfo = new BmFileInfo().setModelId(devInfoVo.getMaId()).setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE);
List<BmFileInfo> fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
ArrayList<Table> 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<BmFileInfo> mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
if (!CollectionUtils.isEmpty(mainFileInfoList)) {

17
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
View File

@ -122,5 +122,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mdc.ma_id = #{maId}
LIMIT 10
</select>
<select id="getQcListByOne" resultType="com.bonus.material.device.domain.MaDevQc">
SELECT
mdc.qc_time,
mt.maintenance_alarm_day,
mdc.qc_user,
mdc.next_check_time,
sd.dept_name comName
FROM
ma_dev_qc mdc
LEFT JOIN ma_dev_info mdi ON mdc.ma_id = mdi.ma_id
LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
LEFT JOIN sys_dept sd ON mdc.qc_com = sd.dept_id
WHERE
mdc.ma_id = #{maId}
order by mdc.qc_time desc
LIMIT 1
</select>
</mapper>