Merge remote-tracking branch 'origin/master'

zhangherong

6 天以前 d6372da6f37778e90a4bae02865e8ec77e980b6e

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml

@@ -112,6 +112,7 @@
                LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
                LEFT JOIN eam_inspection_order t3 ON t3.inspection_date = t1.plan_inspection_date
                AND t3.equipment_id = t1.equipment_id
                AND t1.inspector IS NOT NULL
        WHERE
            t2.equipment_code = #{equipmentCode}
            AND t3.inspection_date LIKE CONCAT(#{inspectionDate},'%')