From 3821004d0e58be13a6b5a82754d130a9d5b6574e Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 23 Dec 2024 10:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E8=AE=B0=E5=BD=95=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/device/domain/MaDevQc.java   |  3 +++
 .../material/device/mapper/BmFileInfoMapper.java    |  1 +
 .../device/service/impl/DevInfoServiceImpl.java     |  9 +++++++++
 .../mapper/material/device/BmFileInfoMapper.xml     | 13 +++++++++++++
 .../mapper/material/device/MaDevQcMapper.xml        |  2 ++
 5 files changed, 28 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java
index 8728279..31848cd 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java
@@ -66,6 +66,9 @@ public class MaDevQc extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "附件信息")
     private List<BmFileInfo> fileInfoList;
 
+    @ApiModelProperty(value = "附件信息")
+    private BmFileInfo fileInfo;
+
     @ApiModelProperty(value = "附件地址")
     private String url;
 
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 e344c22..5d04438 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
@@ -27,6 +27,7 @@ public interface BmFileInfoMapper {
      * @return 附件集合
      */
     List<BmFileInfo> selectBmFileInfoList(BmFileInfo bmFileInfo);
+    BmFileInfo selectBmFileInfo(BmFileInfo bmFileInfo);
 
     /**
      * 新增附件
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 dd4d122..0f90f6c 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
@@ -167,6 +167,15 @@ public class DevInfoServiceImpl implements DevInfoService {
 
             //查询质检记录
             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);
         }
         return devInfoVo;
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 11a6c39..5ccf15f 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
@@ -41,6 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getTypeInfo" resultType="com.bonus.common.biz.domain.TypeInfo">
         select type_id from ma_type where type_name = #{deviceName}
     </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 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 a7605c9..2fc3bcd 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
@@ -119,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc">
         SELECT
             mdc.qc_time,
+            mdc.id,
+            mdc.ma_id,
             mt.maintenance_alarm_day,
             sd.dept_name comName
         FROM