Commit cb7aec8c by wangchunyang

统计查询调整

parent 5e903f55
...@@ -740,10 +740,10 @@ ...@@ -740,10 +740,10 @@
<where> <where>
AND ba.is_used=1 and ad.is_used=1 and ba.approval_status = 9 AND ba.is_used=1 and ad.is_used=1 and ba.approval_status = 9
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND ba.create_time &gt; #{start} AND ba.create_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND ba.create_time &lt; #{end} AND ba.create_time &lt;= #{end}
</if> </if>
<if test="material != null and material != ''"> <if test="material != null and material != ''">
AND (ad.material_name LIKE CONCAT('%', #{material}, '%') OR ad.material_code LIKE CONCAT('%', #{material}, '%')) AND (ad.material_name LIKE CONCAT('%', #{material}, '%') OR ad.material_code LIKE CONCAT('%', #{material}, '%'))
...@@ -773,10 +773,10 @@ ...@@ -773,10 +773,10 @@
<where> <where>
AND ba.is_used=1 and ad.is_used=1 and ba.approval_status = 9 AND ba.is_used=1 and ad.is_used=1 and ba.approval_status = 9
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND ba.create_time &gt; #{start} AND ba.create_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND ba.create_time &lt; #{end} AND ba.create_time &lt;= #{end}
</if> </if>
<if test="material != null and material != ''"> <if test="material != null and material != ''">
AND ad.material_id = #{material} AND ad.material_id = #{material}
...@@ -785,7 +785,6 @@ ...@@ -785,7 +785,6 @@
AND ba.department_id = #{department} AND ba.department_id = #{department}
</if> </if>
</where> </where>
GROUP BY ba.department_id, ba.department_name, ad.material_id,ad.material_name
ORDER BY apply_quantity DESC ORDER BY apply_quantity DESC
</select> </select>
...@@ -795,54 +794,67 @@ ...@@ -795,54 +794,67 @@
SUM(leave_app) AS leave_applications, SUM(leave_app) AS leave_applications,
SUM(leave_approve) AS leave_approvals, SUM(leave_approve) AS leave_approvals,
SUM(borrow_app) AS borrow_applications, SUM(borrow_app) AS borrow_applications,
SUM(borrow_approval) AS borrow_approval,
SUM(inbound_cnt) AS inbound_count, SUM(inbound_cnt) AS inbound_count,
SUM(leave_duration) AS leave_duration SUM(leave_duration) AS leave_duration
FROM ( FROM (
SELECT l.user_id AS uid, l.user_name AS uname, 1 AS leave_app, 0 AS leave_approve, 0 AS borrow_app, 0 AS inbound_cnt, COALESCE(l.duration,0) AS leave_duration SELECT l.user_id AS uid, l.user_name AS uname, 1 AS leave_app, 0 AS leave_approve, 0 AS borrow_app, 0 AS borrow_approval, 0 AS inbound_cnt, COALESCE(l.duration,0) AS leave_duration
FROM jl_key_dm_leave_application l FROM jl_key_dm_leave_application l
<where> <where>
AND l.is_used = 1 AND l.STATUS != 0 AND l.is_used = 1 AND l.STATUS != 0
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND l.start_time &gt; #{start} AND l.start_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND l.start_time &lt; #{end} AND l.start_time &lt;= #{end}
</if> </if>
</where> </where>
UNION ALL UNION ALL
SELECT r.approver_id AS uid, r.approver_name AS uname, 0, CASE WHEN r.approver_result = 1 THEN 1 ELSE 0 END, 0, 0, 0 SELECT r.approver_id AS uid, r.approver_name AS uname, 0, CASE WHEN r.approver_result = 1 THEN 1 ELSE 0 END, 0, 0, 0, 0
FROM jl_key_dm_leave_approval_record r FROM jl_key_dm_leave_approval_record r
<where> <where>
AND r.is_used = 1 AND r.STATUS = 2 AND r.is_used = 1 AND r.STATUS = 2
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND r.approver_time &gt; #{start} AND r.approver_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND r.approver_time &lt; #{end} AND r.approver_time &lt;= #{end}
</if> </if>
</where> </where>
UNION ALL UNION ALL
SELECT b.applicant_id AS uid, b.applicant_name AS uname, 0, 0, 1, 0, 0 SELECT b.applicant_id AS uid, b.applicant_name AS uname, 0, 0, 1, 0, 0, 0
FROM jl_key_dm_borrow_application b FROM jl_key_dm_borrow_application b
<where> <where>
AND b.is_used = 1 AND b.approval_status != 0 AND b.is_used = 1 AND b.approval_status != 0
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND b.submit_time &gt; #{start} AND b.submit_time &gt;= #{start}
</if>
<if test="end != null and end != ''">
AND b.submit_time &lt;= #{end}
</if>
</where>
UNION ALL
SELECT ba.approver_id AS uid, u.name AS uname, 0, 0, 0, 1, 0, 0
FROM jl_key_dm_borrow_application ba left join jl_key_dm_user u on ba.approver_id = u.id
<where>
AND ba.is_used = 1 AND (ba.approval_status = 9 OR ba.approval_status = -1)
<if test="start != null and start != ''">
AND ba.approval_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND b.submit_time &lt; #{end} AND ba.approval_time &lt;= #{end}
</if> </if>
</where> </where>
UNION ALL UNION ALL
SELECT ir.create_by AS uid, du.`name` AS uname, 0, 0, 0, 1, 0 SELECT ir.create_by AS uid, du.`name` AS uname, 0, 0, 0, 0, 1, 0
FROM jl_key_dm_inbound_record ir LEFT JOIN jl_key_dm_user du on ir.create_by = du.id FROM jl_key_dm_inbound_record ir LEFT JOIN jl_key_dm_user du on ir.create_by = du.id
<where> <where>
AND ir.is_used = 1 AND ir.is_used = 1
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND ir.create_time &gt; #{start} AND ir.create_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND ir.create_time &lt; #{end} AND ir.create_time &lt;= #{end}
</if> </if>
</where> </where>
) t LEFT JOIN jl_key_dm_user u on t.uid=u.id LEFT JOIN sys_office o on u.office_id=o.id ) t LEFT JOIN jl_key_dm_user u on t.uid=u.id LEFT JOIN sys_office o on u.office_id=o.id
...@@ -858,10 +870,10 @@ ...@@ -858,10 +870,10 @@
<where> <where>
AND user_id = #{user_id} AND STATUS != 0 AND user_id = #{user_id} AND STATUS != 0
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND create_time &gt; #{start} AND create_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND create_time &lt; #{end} AND create_time &lt;= #{end}
</if> </if>
</where> </where>
ORDER BY create_time DESC ORDER BY create_time DESC
...@@ -873,10 +885,10 @@ ...@@ -873,10 +885,10 @@
<where> <where>
AND b.is_used = 1 AND b.approval_status != 0 AND b.applicant_id = #{user_id} AND b.is_used = 1 AND b.approval_status != 0 AND b.applicant_id = #{user_id}
<if test="start != null and start != ''"> <if test="start != null and start != ''">
AND b.submit_time &gt; #{start} AND b.submit_time &gt;= #{start}
</if> </if>
<if test="end != null and end != ''"> <if test="end != null and end != ''">
AND b.submit_time &lt; #{end} AND b.submit_time &lt;= #{end}
</if> </if>
</where> </where>
ORDER BY b.submit_time DESC ORDER BY b.submit_time DESC
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论