xg

“linengliang”

2024-03-13 580fdf33cff36fed1ec44d51faed994f6c8614f3

xg

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

@@ -256,5 +256,5 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date issueEndDate;
    

}

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

@@ -106,5 +106,8 @@
    private String cycleName;
    @TableField(exist = false)
    private String equipmentId;
    @TableField(exist = false)
    @Dict(dicCode = "maintenance_role")
    private String maintenanceRole;

}

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

@@ -325,6 +325,7 @@
        select t9.* from ( select
           t1.id id,
           t5.name projectName,
           '' as maintenanceRole,
           t5.detection_standard standard,
           '1' as type,
           t6.name cycleName,
@@ -341,6 +342,7 @@
           select
           t3.id id,
           t7.name projectName,
           t3.maintenance_role maintenanceRole,
           t7.standard standard,
           t8.maintenance_type type,
           t8.name cycleName,