From e331906c3191f012deb28ee18384a7087d987687 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 22 十一月 2023 19:16:57 +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/MdcOverallEquipmentEfficiencyMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml index 6e4a36c..7e17582 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml @@ -2,4 +2,52 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.mdc.mapper.MdcOverallEquipmentEfficiencyMapper"> + <!--鍒嗛〉鍒楄〃--> + <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency"> + SELECT + t1.id, + t1.equipment_id, + t1.equipment_name, + t1.equipment_model, + t1.valid_date, + t1.shift, + t1.shift_time_count, + t1.overtime, + t1.actual_work_day_count, + t1.month_actual_work_day_time_count, + t1.breakdown_down_duration, + t1.conversion_debug_duration, + t1.material_shortage_duration, + t1.planned_task_duration, + t1.inspect_duration, + t1.other_duration, + t1.planned_maintenance_duration, + t1.conference_training_duration, + t1.other_rest_duration, + t1.load_time, + t1.time_actuation_rate, + t1.process_quantity, + t1.standard_process_duration, + t1.performance_rate, + t1.unqualified_quantity, + t1.pass_rate, + t1.overall_equipment_efficiency, + t1.create_by, + t1.create_time, + t1.update_by, + t1.update_time + FROM + mdc_overall_equipment_efficiency t1 + <where> + <if test="mdcOverallEquipmentEfficiency.startTime != null and mdcOverallEquipmentEfficiency.startTime != '' and mdcOverallEquipmentEfficiency.endTime != null and mdcOverallEquipmentEfficiency.endTime != ''"> + AND t1.valid_date BETWEEN #{ mdcOverallEquipmentEfficiency.startTime } AND #{ mdcOverallEquipmentEfficiency.endTime } + </if> + <if test="mdcOverallEquipmentEfficiency.equipmentIdList != null and mdcOverallEquipmentEfficiency.equipmentIdList.size() > 0 "> + AND t1.equipment_id IN + <foreach collection="mdcOverallEquipmentEfficiency.equipmentIdList" item="id" index="index" open="(" close=")" separator=","> + #{ id } + </foreach> + </if> + </where> + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3