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 @@
remarks,
dev_id,
is_hg,
+ department_id,
id
@@ -136,6 +137,7 @@
#{params.remarks},
#{params.devId},
#{params.isHg},
+ #{params.departmentId},
null
@@ -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}