|
@@ -696,39 +696,40 @@
|
|
|
|
|
|
|
|
|
|
<select id="getTaskListByIds" resultType="java.util.HashMap">
|
|
<select id="getTaskListByIds" resultType="java.util.HashMap">
|
|
- select * from (
|
|
|
|
- SELECT
|
|
|
|
- p.id AS package_id,
|
|
|
|
- p.score_package_name AS score_name,
|
|
|
|
- c.realname AS realname,
|
|
|
|
- d.name AS dept_name,
|
|
|
|
- m.label AS base_id,
|
|
|
|
- sum(t.score) score,
|
|
|
|
- count(1) score_count,
|
|
|
|
- DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
|
|
|
|
- FROM wm_task t
|
|
|
|
- LEFT JOIN wm_score_package p ON t.score_package_id = p.id
|
|
|
|
- JOIN wm_task_type b
|
|
|
|
- left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
|
|
|
|
- JOIN sys_user c
|
|
|
|
- JOIN sys_dept d
|
|
|
|
- WHERE b.id = t.task_type_id
|
|
|
|
|
|
+ SELECT *
|
|
|
|
+ FROM (SELECT p.id AS package_id,
|
|
|
|
+ p.score_package_name AS score_name,
|
|
|
|
+ c.realname AS realname,
|
|
|
|
+ d.name AS dept_name,
|
|
|
|
+ m.label AS base_id,
|
|
|
|
+ SUM(t.score) score,
|
|
|
|
+ COUNT(1) score_count,
|
|
|
|
+ DATE_FORMAT(MAX(t.lookinto_date), '%Y-%m-%d') create_time
|
|
|
|
+ FROM wm_task t,
|
|
|
|
+ wm_score_package p,
|
|
|
|
+ wm_task_type b,
|
|
|
|
+ sys_dict_item m,
|
|
|
|
+ sys_user c,
|
|
|
|
+ sys_dept d
|
|
|
|
+ WHERE t.score_package_id = p.id
|
|
|
|
+ AND m.type = 'score_task_type'
|
|
|
|
+ AND b.parent_id = m.`value`
|
|
|
|
+ AND b.id = t.task_type_id
|
|
AND c.user_id = t.task_user_id
|
|
AND c.user_id = t.task_user_id
|
|
AND c.dept_id = d.dept_id
|
|
AND c.dept_id = d.dept_id
|
|
- and t.task_status=3
|
|
|
|
- and t.enable_flag=0
|
|
|
|
- and t.del_flag=0
|
|
|
|
- and t.real_flag = '0'
|
|
|
|
|
|
+ AND t.task_status = '3'
|
|
|
|
+ AND t.enable_flag = '0'
|
|
|
|
+ AND t.del_flag = '0'
|
|
|
|
+ AND t.real_flag = '0'
|
|
<if test="query.id!=null and query.id!=''">
|
|
<if test="query.id!=null and query.id!=''">
|
|
AND t.id in(${query.id})
|
|
AND t.id in(${query.id})
|
|
</if>
|
|
</if>
|
|
- group by
|
|
|
|
- p.id,
|
|
|
|
|
|
+ GROUP BY p.id,
|
|
p.score_package_name,
|
|
p.score_package_name,
|
|
m.label,
|
|
m.label,
|
|
c.realname,
|
|
c.realname,
|
|
- d.name
|
|
|
|
- )a ORDER BY a.dept_name,a.score_name,a.realname
|
|
|
|
|
|
+ d.name) a
|
|
|
|
+ ORDER BY a.dept_name, a.score_name, a.realname
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getTaskListByIdsOld" resultType="java.util.HashMap">
|
|
<select id="getTaskListByIdsOld" resultType="java.util.HashMap">
|