From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 1d8fd97..8989776 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -431,6 +431,22 @@
</where>
limit 1
</select>
+ <select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
+ select `CREATE_USER` ,sum(CASE WHEN salary_type=0 THEN salary ELSE 0 END ) as jijiaSalry
+ ,sum(CASE WHEN salary_type=0 THEN 0 ELSE salary END ) as jishiSalary
+ ,count(id) as num
+ ,sum(salary) as totalSalary
+ from `workorder_record`
+ where `DELETED` =0 and `SALARY` >0
+ <if test="rootDepartId != null">
+ AND `ROOT_DEPART_ID` = #{rootDepartId}
+ </if>
+ <if test="userId != null">
+ AND `CREATE_USER` = #{userId}
+ </if>
+ group by `CREATE_USER`
+
+ </select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
`a`.`ID`,
@@ -1427,6 +1443,7 @@
RELOBJ_TYPE,
`DURATION`,
`SALARY`,
+ `SALARY_PRICE`,
`SALARY_NUM`,
`SALARY_TIMES`,
`SALARY_UNQUALIFIED`,
@@ -1471,6 +1488,7 @@
#{item.relobjType},
#{item.duration},
#{item.salary},
+ #{item.salaryPrice},
#{item.salaryNum},
#{item.salaryTimes},
#{item.salaryUnqualified},
--
Gitblit v1.9.3