diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
index f8fae99..4d2f4ad 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
+++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
@@ -83,6 +83,10 @@ public class SysCarFault extends BaseEntity{
@Excel(name = "是否警告(0.开启 1.禁止)")
private Integer warnStatus;
+ /**车辆类型 */
+ @Excel(name = "车辆类型")
+ private Integer carTypeId;
+
@Override
diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
index e039170..eb6159e 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
+++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
@@ -58,12 +58,18 @@ public class SysCarFaultServiceImpl
if (StringUtils.isNotEmpty(sysCarFault.getFaultBit())){
queryWrapper.eq(SysCarFault::getFaultBit, sysCarFault.getFaultBit());
}
+
if (sysCarFault.getFaultRank()!=null){
queryWrapper.eq(SysCarFault::getFaultRank, sysCarFault.getFaultRank());
}
+ //故障码类型
if (sysCarFault.getTypeId()!=null){
queryWrapper.eq(SysCarFault::getTypeId,sysCarFault.getTypeId());
}
+ //车辆类型查询
+ if (sysCarFault.getCarTypeId()!=null){
+ queryWrapper.eq(SysCarFault::getCarTypeId,sysCarFault.getTypeId());
+ }
return this.list(queryWrapper);
}
diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
index ce92f4c..ae33de2 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
+++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
@@ -23,10 +23,11 @@
+
- select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault
+ select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time,car_type_id from sys_car_fault