From 7fdf35a2364c8482c5056a1c932e1501518f943b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:17:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 8989776..c8fb3d7 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -431,8 +431,42 @@
</where>
limit 1
</select>
+ <select id="userSalaryPage" parameterType="doumeemes.dao.ext.dto.QueryUserSalaryListDTO" resultType="doumeemes.dao.ext.vo.UserSalaryListVO">
+ select a.WORKORDER_ID,b.`CODE` as workorderCode,c.`NAME` as materialName,c.code as materialCode
+ ,d.name as unitName,a.PROCEDURE_ID,f.`NAME` as procedureName,a.CREATE_USER as userId
+ ,sum(a.QUALIFIED_NUM) as qualifiedNum
+ ,sum(a.UNQUALIFIED_NUM) as unQualifiedNum
+ ,sum(a.num) as NUM
+ from `workorder_record` a
+ left join workorder b on a.WORKORDER_ID=b.id
+ left join material_distribute m on b.MATERIAL_ID = m.ID
+ left join material c on m.MATERIAL_ID = c.ID
+ left join unit d on a.UNIT_ID = d.ID
+ left join procedures f on a.PROCEDURE_ID =f.ID
+ where a.DELETED = 0
+ <if test="rootDepartId != null">
+ AND a.`ROOT_DEPART_ID` = #{rootDepartId}
+ </if>
+ <if test="procedureId != null">
+ AND a.`PROCEDURE_ID` = #{procedureId}
+ </if>
+ <if test="materialName != null and materialName !=''">
+ AND (c.`name` like concat('%', #{materialName},'%') or c.`code` like concat('%', #{materialName},'%'))
+ </if>
+ <if test="startDate != null">
+ AND a.`CREATE_TIME` >= #{startDate}
+ </if>
+ <if test="endDate != null">
+ AND #{endDate} >= a.`CREATE_TIME`
+ </if>
+ <if test="userId != null">
+ AND a.`CREATE_USER` = #{userId}
+ </if>
+ group by a.`WORKORDER_ID`
+ order by a.CREATE_TIME desc
+ </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
+ select `CREATE_USER` as userId ,sum(CASE WHEN salary_type=0 THEN salary ELSE 0 END ) as jijianSalary
,sum(CASE WHEN salary_type=0 THEN 0 ELSE salary END ) as jishiSalary
,count(id) as num
,sum(salary) as totalSalary
@@ -444,8 +478,14 @@
<if test="userId != null">
AND `CREATE_USER` = #{userId}
</if>
+ <if test="startDate != null">
+ AND a.`CREATE_TIME` >= #{startDate}
+ </if>
+ <if test="endDate != null">
+ AND #{endDate} >= a.`CREATE_TIME`
+ </if>
group by `CREATE_USER`
-
+ <!-- order by `CREATE_TIME` desc-->
</select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
--
Gitblit v1.9.3