From 621f1bdaa9d84ea7e1fba28d883c4927a14ee485 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期一, 09 九月 2024 14:34:51 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml index 0785e3a..267045c 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml @@ -28,6 +28,18 @@ <if test="vo.equipmentType != null and vo.equipmentType != '' "> AND t2.equipment_type = #{ vo.equipmentType } </if> + <if test="vo.driveType != null and vo.driveType != '' "> + AND t2.drive_type = #{ vo.driveType } + </if> + <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> + AND t2.device_level = #{vo.deviceLevel} + </if> + <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> + AND t2.device_category = #{vo.deviceCategory} + </if> + <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> + AND t2.device_importance_level = #{vo.deviceImportanceLevel} + </if> <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 "> AND t2.equipment_id IN <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=","> @@ -65,6 +77,18 @@ AND t1.the_date >= #{ vo.startTime } <if test="vo.equipmentType != null and vo.equipmentType != '' "> AND t2.equipment_type = #{ vo.equipmentType } + </if> + <if test="vo.driveType != null and vo.driveType != '' "> + AND t2.drive_type = #{ vo.driveType } + </if> + <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> + AND t2.device_level = #{vo.deviceLevel} + </if> + <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> + AND t2.device_category = #{vo.deviceCategory} + </if> + <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> + AND t2.device_importance_level = #{vo.deviceImportanceLevel} </if> <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 "> AND t2.equipment_id IN @@ -110,6 +134,18 @@ <if test="vo.equipmentType != null and vo.equipmentType != '' "> AND t2.equipment_type = #{ vo.equipmentType } </if> + <if test="vo.driveType != null and vo.driveType != '' "> + AND t2.drive_type = #{ vo.driveType } + </if> + <if test="vo.deviceLevel != null and vo.deviceLevel != '' "> + AND t2.device_level = #{vo.deviceLevel} + </if> + <if test="vo.deviceCategory != null and vo.deviceCategory != '' "> + AND t2.device_category = #{vo.deviceCategory} + </if> + <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' "> + AND t2.device_importance_level = #{vo.deviceImportanceLevel} + </if> </where> GROUP BY t2.equipment_id, @@ -148,4 +184,15 @@ GROUP BY mesi.equipment_id </select> + + + <select id="getEfficiencyRate" resultType="java.math.BigDecimal"> + SELECT + process_long + FROM + mdc_equipment_statistical_info + WHERE + equipment_id = #{ equipmentId } AND the_date >= #{ date } + ORDER BY the_date ASC + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3