From 0189beb20d537e0c231d241e0b8a559306d0c698 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 25 Jul 2024 15:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java     | 3 +++
 .../java/com/bonus/aqgqj/basis/entity/vo/SampleDeviceVo.java | 2 ++
 src/main/resources/mappers/basis/ExperimentalMapper.xml      | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
index bbf573a..f6a986f 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
@@ -58,6 +58,9 @@ public class ExperDevVo {
     @Length(max = 256, message = "备注字符长度不能超过256", groups = {Query.class})
     private String remarks;
 
+    @NotNull(message = "部门id不能为空", groups = {Query.class})
+    private Integer departmentId;
+
     /*是否合格*/
     private String isHg;
 
diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/SampleDeviceVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/SampleDeviceVo.java
index 2da7c3a..66da474 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/SampleDeviceVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/SampleDeviceVo.java
@@ -22,4 +22,6 @@ public class SampleDeviceVo {
     private String devModule;
     /**设备编号*/
     private String devCode;
+    /**部门ID*/
+    private Integer departmentId;
 }
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index b8bf301..6a64415 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -122,6 +122,7 @@
             <if test="params.remarks != null and params.remarks != ''">remarks,</if>
             <if test="params.devId != null">dev_id,</if>
             <if test="params.isHg != null and params.isHg != ''">is_hg,</if>
+            <if test="params.departmentId != null">department_id,</if>
             id
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -136,6 +137,7 @@
             <if test="params.remarks != null and params.remarks != ''">#{params.remarks},</if>
             <if test="params.devId != null">#{params.devId},</if>
             <if test="params.isHg != null and params.isHg != ''">#{params.isHg},</if>
+            <if test="params.departmentId != null">#{params.departmentId},</if>
             null
         </trim>
     </insert>
@@ -391,7 +393,8 @@
                dev_code   AS devCode,
                dev_module AS devModule,
                dev_type_code AS devTypeCode,
-               dev_type_name AS devTypeName
+               dev_type_name AS devTypeName,
+               department_id AS departmentId
         FROM tb_sample_device
         WHERE sample_id = #{id}
           AND dev_type_code = #{devTypeCode}