app收样新需求
This commit is contained in:
parent
1140e9733f
commit
1b0df9249b
|
|
@ -646,13 +646,18 @@
|
||||||
|
|
||||||
<select id="getLsExperDevs" resultType="com.bonus.aqgqj.app.entity.ExperDevAppVo">
|
<select id="getLsExperDevs" resultType="com.bonus.aqgqj.app.entity.ExperDevAppVo">
|
||||||
SELECT tsd.id,
|
SELECT tsd.id,
|
||||||
tsd.dev_code AS devCode,
|
tsd.dev_code AS devCode,
|
||||||
tsd.dev_module AS devModule,
|
tsd.dev_module AS devModule,
|
||||||
|
tsd.dev_type_code AS devTypeCode,
|
||||||
|
tsd.dev_type_name AS devTypeName,
|
||||||
tsd.department_id AS departmentId,
|
tsd.department_id AS departmentId,
|
||||||
tsd.id AS devId
|
tsd.id AS devId
|
||||||
FROM tb_sample_device tsd
|
FROM tb_sample_device tsd
|
||||||
LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
|
LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
|
||||||
WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL
|
WHERE tsd.sample_id = #{sampleId}
|
||||||
|
AND tsd.dev_type_code = #{devTypeCode}
|
||||||
|
AND tsd.del_falg = 0
|
||||||
|
AND ted.id IS NULL
|
||||||
ORDER BY tsd.id
|
ORDER BY tsd.id
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
|
|
@ -264,7 +264,7 @@
|
||||||
tb_exper_config_info teci
|
tb_exper_config_info teci
|
||||||
LEFT JOIN tb_exper_config tec ON teci.config_id = tec.id
|
LEFT JOIN tb_exper_config tec ON teci.config_id = tec.id
|
||||||
LEFT JOIN tb_config_items tci ON teci.item_id = tci.id
|
LEFT JOIN tb_config_items tci ON teci.item_id = tci.id
|
||||||
LEFT JOIN tb_sample_device tsd ON tec.dev_type_name = tsd.dev_type_name
|
LEFT JOIN tb_sample_device tsd ON tec.dev_type_name = tsd.dev_type_name and tsd.del_falg=0
|
||||||
WHERE
|
WHERE
|
||||||
tsd.sample_id = #{id}
|
tsd.sample_id = #{id}
|
||||||
AND tec.del_flag = 0
|
AND tec.del_flag = 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue