Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 be8a6f171bd41aa50fb7310b2ccbe753dac20b89

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

@@ -64,12 +64,15 @@

    IPage<Equipment> pageEquipment(IPage<Map> pageData,@Param("params") Map<String, Object> params);

    IPage<Map<String, Object>> getEquipmentListAllStandard(IPage<Map> pageData, @Param("params") Map<String,Object> params);

    List<Equipment> getEquipmentList(   Page<Equipment> page,
                                       @Param("num") String num,
                                       @Param("name")String name,
                                       @Param("model")String model,
                                       @Param("workCenterId")String workCenterId,
                                       @Param("factoryModelId")String factoryModelId,
                                        @Param("areaId")String areaId,
                                       @Param("manageId")String manageId,
                                       @Param("useId")String useId,
                                       @Param("equipmentImportanceId")String equipmentImportanceId,
@@ -79,7 +82,37 @@
                                       @Param("warrantyStart")Date warrantyStart,
                                       @Param("warrantyEnd")Date warrantyEnd,
                                        @Param("lineId")String lineId,
                                       @Param("sql")String sql
                                        @Param("isLineEquip")String isLineEquip,
                                       @Param("isLine")String isLine,
                                        @Param("equipmentCategoryId")String equipmentCategoryId,
                                       @Param("equipNums") List<String> equipNums,
                                       @Param("sql")String sql,
                                       @Param("userWorkCenterIds")List<String> userWorkCenterIds
    );

    List<Equipment> getEquipmentTZList(   Page<Equipment> page,
                                        @Param("num") String num,
                                        @Param("name")String name,
                                        @Param("model")String model,
                                        @Param("workCenterIds")List<String> workCenterIds,
                                        @Param("factoryModelId")String factoryModelId,
                                        @Param("areaId")String areaId,
                                        @Param("manageId")String manageId,
                                        @Param("useId")String useId,
                                        @Param("equipmentImportanceId")String equipmentImportanceId,
                                        @Param("technologyStatus")String technologyStatus,
                                        @Param("equipmentStatus")String equipmentStatus,
                                        @Param("specificEquipment")String specificEquipment,
                                        @Param("warrantyStart")Date warrantyStart,
                                        @Param("warrantyEnd")Date warrantyEnd,
                                        @Param("lineId")String lineId,
                                        @Param("isLineEquip")String isLineEquip,
                                        @Param("isLine")String isLine,
                                        @Param("equipmentCategoryId")String equipmentCategoryId,
                                        @Param("equipNums") List<String> equipNums,
                                        @Param("sql")String sql
    );
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);

    List<Map<String, Object>> exportXlsNew();
}