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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-12-27 13:53:26 +08:00
parent ea37a7df12 0352bc784c
commit a521cf21a3
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java
View File

@ -2,6 +2,7 @@ package com.bonus.material.device.mapper;
import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.BmFileInfo;
import com.bonus.common.biz.domain.TypeInfo; import com.bonus.common.biz.domain.TypeInfo;
import com.bonus.material.device.domain.MaDevQc;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -83,4 +84,6 @@ public interface BmFileInfoMapper {
String getUrlById(Integer fileId); String getUrlById(Integer fileId);
Integer deleteBmFileInfoByFileId(@Param("fileId") Integer fileId, @Param("fileType") Integer fileType); Integer deleteBmFileInfoByFileId(@Param("fileId") Integer fileId, @Param("fileType") Integer fileType);
BmFileInfo getInfoByMaIdAndTaskId(MaDevQc qc);
} }

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

@ -116,9 +116,9 @@ public class DevInfoServiceImpl implements DevInfoService {
devInfoVo.getMainFileList().add(item); devInfoVo.getMainFileList().add(item);
} else if (item.getFileType().equals(Long.valueOf(DETAILS_IMAGES_DICT_VALUE))) { } else if (item.getFileType().equals(Long.valueOf(DETAILS_IMAGES_DICT_VALUE))) {
devInfoVo.getDetailsFileList().add(item); 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); 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); devInfoVo.getInsurancePdf().add(item);
} }
@ -134,6 +134,7 @@ public class DevInfoServiceImpl implements DevInfoService {
table.setId(qc.getId()); table.setId(qc.getId());
table.setCheckDate(qc.getQcTime()); table.setCheckDate(qc.getQcTime());
table.setNextCheckDate(qc.getNextCheckTime()); table.setNextCheckDate(qc.getNextCheckTime());
devInfoVo.getExaminationPdf().add(bmFileInfoMapper.getInfoByMaIdAndTaskId(qc));
} }
tableList.add(table); tableList.add(table);
devInfoVo.setTableList(tableList); devInfoVo.setTableList(tableList);

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

@ -145,7 +145,7 @@ public class MaDevQcServiceImpl implements MaDevQcService {
public Integer deleteById(MaDevQc maDevQc) { public Integer deleteById(MaDevQc maDevQc) {
int i = maDevQcMapper.deleteDevQcByFileId(maDevQc.getFileId()); int i = maDevQcMapper.deleteDevQcByFileId(maDevQc.getFileId());
if (i > 0) { if (i > 0) {
bmFileInfoMapper.deleteBmFileInfoByMaId(maDevQc.getFileId(),4); bmFileInfoMapper.deleteBmFileInfoByFileId(maDevQc.getFileId(),4);
} }
return i; return i;
} }

10
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
View File

@ -63,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getUrlById" resultType="java.lang.String"> <select id="getUrlById" resultType="java.lang.String">
select url from bm_file_info where id = #{id} select url from bm_file_info where id = #{id}
</select> </select>
<select id="getInfoByMaIdAndTaskId" resultType="com.bonus.common.biz.domain.BmFileInfo">
select
id, task_type, task_id, model_id, name fileName, url fileUrl, file_type, create_by, create_time
from bm_file_info
WHERE
model_id = #{maId}
and task_id = #{id}
and task_type = 17
and file_type = 4
</select>
<insert id="insertBmFileInfo" parameterType="com.bonus.common.biz.domain.BmFileInfo" useGeneratedKeys="true" keyProperty="id"> <insert id="insertBmFileInfo" parameterType="com.bonus.common.biz.domain.BmFileInfo" useGeneratedKeys="true" keyProperty="id">
insert into bm_file_info insert into bm_file_info

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

@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT SELECT
mdc.id, mdc.id,
mdc.qc_time, mdc.qc_time,
mdc.ma_id,
mt.maintenance_alarm_day, mt.maintenance_alarm_day,
mdc.qc_user, mdc.qc_user,
mdc.next_check_time, mdc.next_check_time,