From 6e87427cfa321ef19de499c6b397af6eb2938401 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 20 Dec 2024 16:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/device/domain/MaDevQc.java   |  4 ++++
 .../mapper/material/device/MaDevQcMapper.xml        | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

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 e46560d..7e25834 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
@@ -75,9 +75,13 @@ public class MaDevQc extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "创建人所属公司")
     private String qcCom;
 
+    @ApiModelProperty(value = "创建人所属公司名称")
+    private String comName;
+
     @ApiModelProperty(value = "质检次数")
     private Integer minNum;
     private Integer maxNum;
 
+    private Integer maintenanceAlarmDay;
 }
 
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 af41436..282142c 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
@@ -109,7 +109,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc">
-        select * from ma_dev_qc where ma_id = #{maId} limit 10
+        SELECT
+            mdc.qc_time,
+            mt.maintenance_alarm_day,
+            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}
+            LIMIT 10
     </select>
 
 </mapper>