文档名称来源 修改

qushaowei

2023-08-31 215485725d2aa0b17f7b0e965163ab13924fa1e4

文档名称来源 修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java

@@ -126,7 +126,7 @@
        String type = json.getString("type");

        EquipmentDocument equipmentDocument = json.toJavaObject(EquipmentDocument.class);
        equipmentDocument.setType(fileType);
        equipmentDocument.setFileType(fileType);
        equipmentDocumentService.save(equipmentDocument);
        // 文件变更
        if (isFileChange) {
@@ -166,7 +166,7 @@
        String type = json.getString("type");

        EquipmentDocument equipmentDocument = json.toJavaObject(EquipmentDocument.class);
        equipmentDocument.setType(fileType);
        equipmentDocument.setFileType(fileType);
        equipmentDocumentService.saveOrUpdate(equipmentDocument);
        // 文件变更
        if (isFileChange) {

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

@@ -46,8 +46,9 @@
    /**文档类型*/
    @Excel(name = "文档类型", width = 15)
    @ApiModelProperty(value = "文档类型")
    @Dict(dicCode = "common_upload_type")
    private String type;
//    @Dict(dicCode = "common_upload_type")
    @Dict(dictTable = "mom_eam_document_type",dicCode = "id",dicText = "name")
    private String fileType;

    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)

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

@@ -39,7 +39,7 @@
    /**文档类型*/
    @Excel(name = "文档类型", width = 15)
    @ApiModelProperty(value = "文档类型")
    @Dict(dicCode = "common_upload_type")
    @Dict(dictTable = "mom_eam_document_type",dicCode = "id",dicText = "name")
    private String documentTypeId;
    /**文档名称*/
    @Excel(name = "文档名称", width = 15)

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

@@ -8,12 +8,12 @@
            t1.num,
            t2.name,
            t2.type,
            t3.item_text AS typeName,
            t3.name AS typeName,
            t2.size
        FROM
            mom_eam_maintenance_standard_work_instruction t1
        LEFT JOIN mom_sys_upload t2 ON t1.work_instruction_id = t2.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'common_upload_type' ) t3 ON t3.item_value = t2.type
        LEFT JOIN mom_eam_document_type t3 ON t3.id = t2.type
        WHERE t1.del_flag = 0
        <if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
            and t1.maintenance_standard_id = #{params.maintenanceStandardId}