From 26e4b49b3b51e123e9ce2b055c8e0d37d35df260 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 22:05:44 +0800
Subject: [PATCH] #字段结果
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index f4c1edd..d1476ae 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -444,6 +444,7 @@
left join unit d on a.UNIT_ID = d.ID
left join procedures f on a.PROCEDURE_ID =f.ID
where a.DELETED = 0
+ and a.TYPE = 1
<if test="rootDepartId != null">
AND a.`ROOT_DEPART_ID` = #{rootDepartId}
</if>
@@ -453,11 +454,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}
@@ -468,7 +469,7 @@
<select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
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
+ ,count(distinct(workorder_id)) as num
,sum(salary) as totalSalary
from `workorder_record`
where `DELETED` =0 and `SALARY` >0
@@ -478,15 +479,73 @@
<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
+ <if test="procedureId != null">
+ AND a.`PROCEDURE_ID` = #{procedureId}
+ </if>
+ 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) )
+ <if test="procedureId != null">
+ AND a.`PROCEDURE_ID` = #{procedureId}
+ </if>
+ GROUP BY TO_DAYS(a.CREATE_TIME )
+ </select>
+ <select id="getUnqualifiedCateData" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO"
+ resultType="doumeemes.dao.business.dto.statistics.UnqualifiedCateModel">
+ SELECT sum(b.UNQUALIFIED_NUM) as unqualifiedNum,d.`NAME` as categoryName
+ from unqualified_record b
+ left join workorder_record a on b.RECORD_ID=a.id
+ left join workorder c on a.WORKORDER_ID=c.id
+ left join category d on b.CATEGORY_ID=d.id
+ where a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and c.`STATUS`=4 and a.deleted=0
+ and 7>TO_DAYS(now()) - TO_DAYS(a.CREATE_TIME )
+ <if test="procedureId != null">
+ AND a.`PROCEDURE_ID` = #{procedureId}
+ </if>
+ GROUP BY TO_DAYS(d.ID )
+ order by unqualifiedNum desc
+ limit 6
+ </select>
+ <select id="getRecordLog" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO"
+ resultType="doumeemes.dao.business.dto.statistics.RecordLogModel">
+ select a.CREATE_TIME as createTime,a.UNQUALIFIED_NUM as unqualifiedNum,a.QUALIFIED_NUM as qualifiedNum,
+ d.name as userName,c.name as materialName,c.code as materialCode
+ from workorder_record a
+ left join material_distribute b on a.MATERIAL_ID=b.ID
+ left join material c on b.MATERIAL_ID=c.ID
+ left join company_user d on d.DELETED=0 and d.user_id=a.CREATE_USER
+ left JOIN workorder e on e.id=a.WORKORDER_ID
+ where a.DELETED = 0 AND a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} AND e.`STATUS` = 4
+ <if test="procedureId != null">
+ AND a.`PROCEDURE_ID` = #{procedureId}
+ </if>
+ ORDER BY a.CREATE_TIME desc
+
+ </select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
`a`.`ID`,
--
Gitblit v1.9.3