update

Lius

2025-03-03 a3ca445facfebbe65d7133928eae1f9662451f6f

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

@@ -18,12 +18,13 @@
            me.id equId
        FROM
            EquipmentLog a
            INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
            INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) maxgdtime FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
            INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
            INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
            INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
            INNER JOIN mdc_workshop_info mwi ON mew.workshop_id = mwi.id
            AND a.CollectTime= b.maxgdtime
            AND mew.workshop_id = #{ workshopId }
            AND mwi.production_id = #{ productionId }
    </select>

    <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
@@ -38,4 +39,15 @@
        WHERE
            t5.user_id = #{ userId }
    </select>

    <select id="productionListByUser" resultType="org.jeecg.modules.system.entity.MdcProduction">
        SELECT
            t1.*
        FROM
            mdc_production t1
                 LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
        WHERE
            t1.org_type = 2 AND t2.user_id = #{userId}
        ORDER BY t1.production_name
    </select>
</mapper>