|
@@ -209,11 +209,21 @@
|
|
|
lastAverageValue,
|
|
|
lastYearAverageValue
|
|
|
FROM
|
|
|
- (SELECT DISTINCT
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
+ dept.id,
|
|
|
+ dept.NAME,
|
|
|
+ t1.averageValue,
|
|
|
+ t2.lastAverageValue,
|
|
|
+ t3.lastYearAverageValue
|
|
|
+ FROM
|
|
|
+ (
|
|
|
+ SELECT DISTINCT
|
|
|
id,
|
|
|
NAME
|
|
|
FROM
|
|
|
- ((
|
|
|
+ (
|
|
|
+ (
|
|
|
SELECT DISTINCT
|
|
|
a.beh_dept_id AS id,
|
|
|
a.beh_dept_name AS NAME
|
|
@@ -290,6 +300,7 @@
|
|
|
<if test="filterPageByAverageVO.name != null and filterPageByAverageVO.name != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageByAverageVO.name},'%')
|
|
|
</if>
|
|
|
+ ))dept1
|
|
|
) dept
|
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
@@ -406,7 +417,8 @@
|
|
|
lastAverageValue,
|
|
|
lastYearAverageValue
|
|
|
FROM
|
|
|
- (SELECT
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
dept.id,
|
|
|
dept.NAME,
|
|
|
t1.averageValue,
|
|
@@ -415,6 +427,12 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT DISTINCT
|
|
|
+ id,
|
|
|
+ NAME
|
|
|
+ FROM
|
|
|
+ (
|
|
|
+ (
|
|
|
+ SELECT DISTINCT
|
|
|
a.beh_dept_id AS id,
|
|
|
a.beh_dept_name AS NAME
|
|
|
FROM
|
|
@@ -490,6 +508,7 @@
|
|
|
<if test="filterPageByAverageVO.name != null and filterPageByAverageVO.name != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageByAverageVO.name},'%')
|
|
|
</if>
|
|
|
+ ))dept1
|
|
|
) dept
|
|
|
LEFT JOIN (
|
|
|
SELECT
|