|
@@ -406,7 +406,7 @@
|
|
|
|
|
|
|
|
<select id="getTotal" resultMap="TotalResultMap">
|
|
<select id="getTotal" resultMap="TotalResultMap">
|
|
|
|
|
|
|
|
- select dept_name, team_name,
|
|
|
|
|
|
|
+ select max(dept_name), team_name,
|
|
|
'单元' as sbmc,
|
|
'单元' as sbmc,
|
|
|
count(*) as total,
|
|
count(*) as total,
|
|
|
sum(plan) as planTotal,
|
|
sum(plan) as planTotal,
|
|
@@ -435,7 +435,7 @@
|
|
|
and file_id = (select max(id) from show_file where data_type = 'xjdx' and imp_result = '1')
|
|
and file_id = (select max(id) from show_file where data_type = 'xjdx' and imp_result = '1')
|
|
|
) a
|
|
) a
|
|
|
) b
|
|
) b
|
|
|
- group by dept_name, team_name
|
|
|
|
|
|
|
+ group by team_name
|
|
|
|
|
|
|
|
union
|
|
union
|
|
|
|
|
|
