From af00e89990ae9757cc9261cbe560873c2066b69c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:11 +0800
Subject: [PATCH] 大屏统计
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index f4c1edd..8633066 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -453,11 +453,11 @@
<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 test="startDate != null and startDate != ''">
+ AND a.`CREATE_TIME` >= concat(#{startDate},' 00:00:00')
</if>
- <if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
+ <if test="endDate != null and endDate != ''">
+ AND concat(#{endDate},' 23:59:59') >= a.`CREATE_TIME`
</if>
<if test="userId != null">
AND a.`CREATE_USER` = #{userId}
@@ -478,15 +478,36 @@
<if test="userId != null">
AND `CREATE_USER` = #{userId}
</if>
- <if test="startDate != null">
- AND `CREATE_TIME` >= #{startDate}
+ <if test="startDate != null and startDate != ''">
+ AND `CREATE_TIME` >= concat(#{startDate},' 00:00:00')
</if>
- <if test="endDate != null">
- AND #{endDate} >= `CREATE_TIME`
+ <if test="endDate != null and endDate != ''">
+ AND concat(#{endDate},' 23:59:59') >= `CREATE_TIME`
</if>
group by `CREATE_USER`
<!-- order by `CREATE_TIME` desc-->
</select>
+ <select id="getUserProduceTopData" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO"
+ resultType="doumeemes.dao.business.dto.statistics.UserProduceTopModel">
+ SELECT sum(a.num) as doneNum,b.user_id as userId,b.`NAME` as userName,b.PHONE
+ from workorder_record a
+ left join company_user b on b.DELETED=0 and b.user_id=a.CREATE_USER
+ left join workorder c on a.WORKORDER_ID=c.id
+ where a.deleted=0 and a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and s.status=4
+ GROUP BY a.CREATE_USER
+ ORDER By doneNum desc
+ limit 10
+ </select>
+ <select id="getUnqualified7DayData" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO"
+ resultType="doumeemes.dao.business.dto.statistics.Unqualified7DayModel">
+ SELECT sum(a.UNQUALIFIED_NUM) as unqualifiedNum,a.CREATE_TIME
+ from workorder_record a
+ left join workorder c on a.WORKORDER_ID=c.id
+ where a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and c.`STATUS`=4
+ and 7 > (TO_DAYS(now()) - TO_DAYS(a.CREATE_TIME) )
+ GROUP BY TO_DAYS(a.CREATE_TIME )
+
+ </select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
`a`.`ID`,
--
Gitblit v1.9.3