From a3b72bdd43a1e61c2c08a65b1625106d2ac9d3bf Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 18 三月 2024 16:31:38 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml | 62 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml index 555bc70..182be09 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml @@ -5,4 +5,66 @@ <select id="getLastData" resultType="org.jeecg.modules.mdc.entity.MdcProcessCount"> SELECT TOP 1 * FROM mdc_process_count WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC </select> + + <!--鍒嗛〉鏌ヨ--> + <select id="pageList" resultType="org.jeecg.modules.mdc.dto.MdcProcessCountDto"> + SELECT + t1.equipment_id equipmentId, + MAX(t1.equipment_name) equipmentName, + MAX(t2.drive_type) driveType, + t1.sequence_number sequenceNumber, + COUNT(*) processCount, + SUM(t1.duration) duration + FROM + mdc_process_count t1 + LEFT JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id + <where> + <if test="mdcProcessCountVo.equipmentId != null and mdcProcessCountVo.equipmentId != ''"> + AND t1.equipment_id = #{ mdcProcessCountVo.equipmentId } + </if> + <if test="mdcProcessCountVo.equipmentName != null and mdcProcessCountVo.equipmentName != ''"> + AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcProcessCountVo.equipmentName}),'%') + </if> + <if test="mdcProcessCountVo.driveType != null and mdcProcessCountVo.driveType != ''"> + AND t2.drive_type = #{ mdcProcessCountVo.driveType } + </if> + <if test="mdcProcessCountVo.deviceLevel != null and mdcProcessCountVo.deviceLevel != ''"> + AND t2.device_level = #{ mdcProcessCountVo.deviceLevel } + </if> + <if test="mdcProcessCountVo.deviceCategory != null and mdcProcessCountVo.deviceCategory != ''"> + AND t2.device_category = #{ mdcProcessCountVo.deviceCategory } + </if> + <if test="mdcProcessCountVo.startTime != null and mdcProcessCountVo.startTime != '' and mdcProcessCountVo.endTime != '' and mdcProcessCountVo.endTime != null"> + AND t1.the_date BETWEEN #{ mdcProcessCountVo.startTime } AND #{ mdcProcessCountVo.endTime } + </if> + <if test="mdcProcessCountVo.mdcSectionIds != null and mdcProcessCountVo.mdcSectionIds.size() > 0 "> + AND t1.equipment_id IN + <foreach collection="mdcProcessCountVo.mdcSectionIds" item="id" index="index" open="(" close=")" separator=","> + #{ id } + </foreach> + </if> + </where> + GROUP BY + t1.equipment_id, + t1.sequence_number + </select> + + <select id="findDuration" resultType="java.math.BigDecimal"> + SELECT + SUM( duration ) + FROM + mdc_process_count + WHERE + equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%') + </select> + + + <select id="findCount" resultType="java.math.BigDecimal"> + SELECT + count(*) + FROM + mdc_process_count + WHERE + equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%') + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3