From 7ca0b4b585a109b427b510548c78f3e1dcf5ba37 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 26 九月 2024 15:57:42 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 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..40631f8 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,12 +28,25 @@ <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=","> #{ id } </foreach> </if> + AND t2.device_abnormal_status = 1 ORDER BY t1.the_date </select> @@ -66,12 +79,25 @@ <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=","> #{ id } </foreach> </if> + AND t2.device_abnormal_status = 1 ORDER BY t1.the_date </select> @@ -110,6 +136,19 @@ <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> + AND t2.device_abnormal_status = 1 </where> GROUP BY t2.equipment_id, @@ -148,4 +187,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