Lius
2024-09-12 81e5a11d1f8cc8eaeb7875bdafe36a86379d6231
update
已修改3个文件
10 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -174,4 +174,10 @@
    @Dict(dicCode = "device_importance_level")
    @ApiModelProperty(value = "重要程度")
    private Integer deviceImportanceLevel;
    /**
     * 设备异常状态
     */
    @Dict(dicCode = "device_abnormal_status")
    @ApiModelProperty(value = "设备异常状态")
    private Integer deviceAbnormalStatus;
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -217,6 +217,9 @@
            <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
                AND t1.device_category = #{mdcEquipment.deviceCategory}
            </if>
            <if test="mdcEquipment.deviceAbnormalStatus != null and mdcEquipment.deviceAbnormalStatus != '' ">
                AND t1.device_abnormal_status = #{mdcEquipment.deviceAbnormalStatus}
            </if>
            <if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
                AND t3.id IN
                <foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
@@ -20,5 +20,6 @@
    private String deviceCategory;
    private String driveType;
    private String productionName;
    private Integer deviceAbnormalStatus;
    private List<String> productionIds;
}