lyh
2 天以前 f1e4e1427bf35e7d1cb3e0b580cf9995a472f214
添加设备类别
已修改2个文件
7 ■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java
@@ -252,6 +252,9 @@
    //型号
    @TableField(exist = false)
    private String equipmentModel;
    @ApiModelProperty(value = "设备类别")
    @Dict(dicCode = "equipment_category")
    private String equipmentCategory;
    //保养日期
    private String maintenanceDateFormatted;
    //使用单位
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -36,7 +36,9 @@
        WHERE t1.id = #{id}
    </select>
    <select id="queryList" resultType="org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport">
        select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy年MM月dd日') AS maintenance_date_formatted, e.equipment_code, e.equipment_name, e.equipment_model,f.factory_name
        select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy年MM月dd日') AS maintenance_date_formatted,
               e.equipment_code, e.equipment_name, e.equipment_model,e.equipment_category
             ,f.factory_name
        from eam_third_maintenance_order wmo
                 inner join eam_equipment e
                            on wmo.equipment_id = e.id