From 18569b3b13995e616e2bcbef7097438724387f96 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 20 Dec 2024 17:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=BC=96=E8=BE=91=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=A3=85=E5=A4=87=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/device/mapper/MaDevQcMapper.java   |  2 ++
 .../device/service/impl/DevInfoServiceImpl.java | 13 +++++++++++++
 .../mapper/material/device/MaDevQcMapper.xml    | 17 +++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
index 408c511..bdb77ba 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
@@ -45,4 +45,6 @@ public interface MaDevQcMapper {
     List<MaDevQc> selectQcList(MaDevQc maDevQc);
 
     List<MaDevQc> getQcList(Long maId);
+
+    MaDevQc getQcListByOne(Long maId);
 }
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 9d774fb..fc01a2d 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
@@ -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)) {
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 beb972f..5ecc5f1 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
@@ -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>