|
|
@@ -119,8 +119,8 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<select id="getList" resultMap="BaseResultMap2">
|
|
|
- select s.id,s.dept_id,s.lab_id,s.scheduled_time ,d1.dept_name deptName,d2.dept_name
|
|
|
- labName,concat(count(1),'件') c
|
|
|
+ select s.id,s.dept_id,s.lab_id,s.scheduled_time ,d1.dept_name deptName,d2.dept_name labName
|
|
|
+ ,concat(count(1),'件') c
|
|
|
from
|
|
|
sec_scheduled s
|
|
|
left join sec_scheduled_tool r
|
|
|
@@ -134,6 +134,7 @@
|
|
|
<if test="labId!=null and labId!=''">
|
|
|
and s.lab_id=#{labId}
|
|
|
</if>
|
|
|
+ group by s.id
|
|
|
<if test="orderby!=null and orderby!=''">
|
|
|
order by scheduled_time ${orderby}
|
|
|
</if>
|
