update

Lius

2024-09-26 7ca0b4b585a109b427b510548c78f3e1dcf5ba37

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

@@ -58,6 +58,9 @@
        WHERE
            med.equipment_id = me.id
            AND med.dep_id = #{ departId }
            <if test="key != null and key != '' ">
                AND me.device_abnormal_status = 1
            </if>
        ORDER BY me.equipment_id
    </select>

@@ -71,6 +74,9 @@
        WHERE
            mpe.equipment_id = me.id
            AND mpe.production_id = #{ productionId }
          <if test="key != null and key != '' ">
              AND me.device_abnormal_status = 1
          </if>
        ORDER BY me.equipment_id
    </select>

@@ -83,9 +89,9 @@
            LEFT JOIN mdc_production_equipment mpe ON me.id = mpe.equipment_id
        WHERE
            mpe.production_id IN
        <foreach collection="allProductionIds" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
            <foreach collection="allProductionIds" index="index" item="id" open="(" separator="," close=")">
                #{id}
            </foreach>
    </select>

    <!--查询设备监控信息-->
@@ -132,7 +138,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
@@ -142,6 +149,7 @@
            <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">
                #{id}
            </foreach>
            AND me.device_abnormal_status = 1
        </where>
        ORDER BY sd.depart_order
    </select>
@@ -155,7 +163,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
@@ -165,6 +174,7 @@
            <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">
                #{id}
            </foreach>
            AND me.device_abnormal_status = 1
        </where>
        ORDER BY mp.production_order
    </select>
@@ -215,6 +225,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=")">