|
@@ -1451,8 +1451,9 @@
|
|
|
</select>
|
|
</select>
|
|
|
<select id="buildBySub" resultType="com.zd.laboratory.domain.LabSubject">
|
|
<select id="buildBySub" resultType="com.zd.laboratory.domain.LabSubject">
|
|
|
|
|
|
|
|
- select s.id,s.name,s.dept_id deptId,dt.`dept_name` deptName,s.build_id buildId,s.room from lab_subject s
|
|
|
|
|
|
|
+ select s.id,s.name,s.dept_id deptId,dt.`dept_name` deptName,s.build_id buildId,lbf.name buildName, s.room from lab_subject s
|
|
|
INNER JOIN sys_dept dt ON s.`dept_id` = dt.dept_id
|
|
INNER JOIN sys_dept dt ON s.`dept_id` = dt.dept_id
|
|
|
|
|
+ INNER JOIN lab_build_floor lbf ON s.build_id = lbf.id
|
|
|
<where>
|
|
<where>
|
|
|
<if test="buildId != null ">and s.build_id = #{buildId}</if>
|
|
<if test="buildId != null ">and s.build_id = #{buildId}</if>
|
|
|
<if test="searchValue != null and searchValue !=''">
|
|
<if test="searchValue != null and searchValue !=''">
|