|
|
@@ -87,7 +87,13 @@
|
|
|
AND personal.created BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
</if>
|
|
|
<if test="dto != null and dto.efficiencyType == 'statement'">
|
|
|
- AND statement.created BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
+ AND statement.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
+ </if>
|
|
|
+ <if test="dto != null and dto.efficiencyType == 'report'">
|
|
|
+ AND report.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
+ </if>
|
|
|
+ <if test="dto != null and dto.efficiencyType == 'letter'">
|
|
|
+ AND letter.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
</if>
|
|
|
<if test="dto != null and dto.efficiencyType == 'reportAndLetter'">
|
|
|
AND (report.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
@@ -163,6 +169,7 @@
|
|
|
AND production = 'STATEMENT'
|
|
|
AND personal.id = target.personal_id
|
|
|
AND target.id = production.target_id
|
|
|
+ AND production.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
) AS statementCount,
|
|
|
(
|
|
|
SELECT
|
|
|
@@ -177,6 +184,7 @@
|
|
|
AND production = 'FINAL'
|
|
|
AND personal.id = target.personal_id
|
|
|
AND target.id = production.target_id
|
|
|
+ AND production.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
) AS reportCount,
|
|
|
(
|
|
|
SELECT
|
|
|
@@ -191,13 +199,13 @@
|
|
|
AND production = 'LETTER'
|
|
|
AND personal.id = target.personal_id
|
|
|
AND target.id = production.target_id
|
|
|
+ AND production.production_time BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
) AS letterCount
|
|
|
FROM
|
|
|
(SELECT personal.inward_staff, user.name
|
|
|
FROM personal
|
|
|
INNER JOIN user ON user.id = personal.inward_staff AND personal.deleted = 0
|
|
|
AND personal.inward_staff IS NOT NULL
|
|
|
- AND personal.created BETWEEN #{dto.startTime} AND #{dto.endTime}
|
|
|
GROUP BY personal.inward_staff
|
|
|
) AS main
|
|
|
</select>
|
