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-23 10:07:37 +08:00
parent 46431af1b1
commit 3821004d0e
5 changed files with 28 additions and 0 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/domain/MaDevQc.java
View File

@ -66,6 +66,9 @@ public class MaDevQc extends BaseEntity implements Serializable {
@ApiModelProperty(value = "附件信息") @ApiModelProperty(value = "附件信息")
private List<BmFileInfo> fileInfoList; private List<BmFileInfo> fileInfoList;
@ApiModelProperty(value = "附件信息")
private BmFileInfo fileInfo;
@ApiModelProperty(value = "附件地址") @ApiModelProperty(value = "附件地址")
private String url; private String url;

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

@ -27,6 +27,7 @@ public interface BmFileInfoMapper {
* @return 附件集合 * @return 附件集合
*/ */
List<BmFileInfo> selectBmFileInfoList(BmFileInfo bmFileInfo); List<BmFileInfo> selectBmFileInfoList(BmFileInfo bmFileInfo);
BmFileInfo selectBmFileInfo(BmFileInfo bmFileInfo);
/** /**
* 新增附件 * 新增附件

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

@ -167,6 +167,15 @@ public class DevInfoServiceImpl implements DevInfoService {
//查询质检记录 //查询质检记录
List<MaDevQc> qcList = maDevQcMapper.getQcList(maId); List<MaDevQc> 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); devInfoVo.setQcList(qcList);
} }
return devInfoVo; return devInfoVo;

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

@ -41,6 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getTypeInfo" resultType="com.bonus.common.biz.domain.TypeInfo"> <select id="getTypeInfo" resultType="com.bonus.common.biz.domain.TypeInfo">
select type_id from ma_type where type_name = #{deviceName} select type_id from ma_type where type_name = #{deviceName}
</select> </select>
<select id="selectBmFileInfo" resultType="com.bonus.common.biz.domain.BmFileInfo">
select
id, task_type, task_id, model_id, name as fileName, url as fileUrl, file_type, create_by, create_time
from bm_file_info
<where>
<if test="taskType != null "> and task_type = #{taskType}</if>
<if test="taskId != null "> and task_id = #{taskId}</if>
<if test="modelId != null "> and model_id = #{modelId}</if>
<if test="fileName != null and name != ''"> and name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and url != ''"> and url = #{fileUrl}</if>
<if test="fileType != null "> and file_type = #{fileType}</if>
</where>
</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

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

@ -119,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc"> <select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc">
SELECT SELECT
mdc.qc_time, mdc.qc_time,
mdc.id,
mdc.ma_id,
mt.maintenance_alarm_day, mt.maintenance_alarm_day,
sd.dept_name comName sd.dept_name comName
FROM FROM