update

Lius

2025-07-07 9729cb7cb30ba7a11119f84dc680c8f302098dc3

update

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java

@@ -113,4 +113,8 @@
    @ApiModelProperty(value = "设备名称")
    @TableField(exist = false)
    private String equipmentName;

    @ApiModelProperty(value = "设备型号")
    @TableField(exist = false)
    private String equipmentModel;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java

@@ -65,6 +65,14 @@
    /**保养要求*/
    @ApiModelProperty(value = "保养要求")
    private String  itemDemand;
    /**点检人*/
    @Excel(name = "点检人", width = 15)
    @ApiModelProperty(value = "点检人")
    private String inspector;
    /**点检时间*/
    @Excel(name = "点检时间", width = 15)
    @ApiModelProperty(value = "点检时间")
    private String inspectTime;

    public EamWeekInspectionDetail(){}


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

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamInspectionOrder">
        select wmo.*, e.equipment_code, e.equipment_name
        select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model
        from eam_inspection_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java

@@ -291,7 +291,7 @@
        query.setEquipmentId(equipmentId);
        query.setKeyword(keyword);
        query.setMaintenanceCategory(maintenanceCategory);
        query.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
        query.setStandardStatus(MaintenanceStandardStatusEnum.START.name());
        IPage<EamMaintenanceStandard> pageData = this.queryPageList(page, query);
        return pageData.getRecords();
    }