This commit is contained in:
parent
31fa45c17f
commit
0189beb20d
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,4 +22,6 @@ public class SampleDeviceVo {
|
|||
private String devModule;
|
||||
/**设备编号*/
|
||||
private String devCode;
|
||||
/**部门ID*/
|
||||
private Integer departmentId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue