Lius
2024-09-12 81e5a11d1f8cc8eaeb7875bdafe36a86379d6231
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -132,7 +132,8 @@
            sd.org_type,
            me.equipment_id,
            me.equipment_name,
            me.equipment_type
            me.equipment_type,
            me.equipment_model
        FROM
            mdc_equipment_depart med
            LEFT JOIN sys_depart sd ON med.dep_id = sd.id
@@ -155,7 +156,8 @@
            mp.org_type,
            me.equipment_id,
            me.equipment_name,
            me.equipment_type
            me.equipment_type,
            me.equipment_model
        FROM
            mdc_production_equipment mpe
            LEFT JOIN mdc_production mp ON mpe.production_id = mp.id
@@ -215,6 +217,9 @@
            <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
                AND t1.device_category = #{mdcEquipment.deviceCategory}
            </if>
            <if test="mdcEquipment.deviceAbnormalStatus != null and mdcEquipment.deviceAbnormalStatus != '' ">
                AND t1.device_abnormal_status = #{mdcEquipment.deviceAbnormalStatus}
            </if>
            <if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
                AND t3.id IN
                <foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">