diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java index c310775..9c4fe15 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java @@ -22,19 +22,15 @@ public interface SysCarFaultLogMapper extends BaseMapper { - @Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" + - "LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id ") - public Listlist(SysCarFaultLog SysCarFaultLog); - @Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" + - "LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id where log.status=1") + public ListselectSysCarFaultLogList(SysCarFaultLog SysCarFaultLog); + + public ListlistStatusSolve(SysCarFaultLog sysCarFaultLog); - @Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" + - "LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id where log.status=2") + public ListlistStatusProcess(SysCarFaultLog sysCarFaultLog); - @Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" + - "LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id where log.status=3") + public ListlistStatusIgnore(SysCarFaultLog sysCarFaultLog); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java index f9551ea..03808aa 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -3,6 +3,7 @@ package com.muyu.breakdown.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.domain.SysCarFaultLog; import com.muyu.breakdown.domain.SysCarFaultLog; import com.muyu.breakdown.mapper.SysCarFaultLogMapper; @@ -31,14 +32,8 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ - wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); - } - if (sysCarFaultLog.getStatus()!=null){ - wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); - } - return sysCarFaultLogMapper.list(sysCarFaultLog); + + return sysCarFaultLogMapper.selectSysCarFaultLogList(sysCarFaultLog); } /** @@ -48,10 +43,7 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl listStatusIgnore(SysCarFaultLog sysCarFaultLog) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ - wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); - } + return sysCarFaultLogMapper.listStatusIgnore(sysCarFaultLog); } @@ -62,20 +54,13 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl listStatusProcess(SysCarFaultLog sysCarFaultLog) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ - wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); - } + return sysCarFaultLogMapper.listStatusProcess(sysCarFaultLog); } //只展示已解决的数据 @Override public List listStatusSolve(SysCarFaultLog sysCarFaultLog) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ - wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); - } return sysCarFaultLogMapper.listStatusSolve(sysCarFaultLog); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultLogMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultLogMapper.xml new file mode 100644 index 0000000..7277355 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultLogMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id + + + + + + + + + + delete from sys_car_fault where id in + + #{id} + + + + +