|
@@ -436,7 +436,7 @@
|
|
|
SELECT
|
|
SELECT
|
|
|
CONCAT( d.ridgepole, d.unit ) AS unit,
|
|
CONCAT( d.ridgepole, d.unit ) AS unit,
|
|
|
de.department_name AS departmentName,
|
|
de.department_name AS departmentName,
|
|
|
- count(de.department_name) as clockCount
|
|
|
|
|
|
|
+ count(ifnull(de.department_id,unit)) AS clockCount
|
|
|
FROM out_scan c
|
|
FROM out_scan c
|
|
|
inner join (select user_id,min(date) as dateStr
|
|
inner join (select user_id,min(date) as dateStr
|
|
|
from out_scan
|
|
from out_scan
|
|
@@ -469,7 +469,7 @@
|
|
|
and de.department_id = #{departmentId}
|
|
and de.department_id = #{departmentId}
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- group by de.department_name, d.ridgepole, d.unit,de.department_name
|
|
|
|
|
|
|
+ group by de.department_id, d.ridgepole, d.unit,de.department_name
|
|
|
order by unit,de.department_name
|
|
order by unit,de.department_name
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
peiguo