text:修改故障展示(改为双表)
parent
c48701bfc9
commit
010ce07083
|
@ -25,4 +25,16 @@ public interface SysCarFaultLogMapper extends BaseMapper<SysCarFaultLog> {
|
||||||
@Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" +
|
@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 ")
|
"LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id ")
|
||||||
public List<SysCarFaultLog>list(SysCarFaultLog SysCarFaultLog);
|
public List<SysCarFaultLog>list(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 List<SysCarFaultLog>listStatusSolve(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 List<SysCarFaultLog>listStatusProcess(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 List<SysCarFaultLog>listStatusIgnore(SysCarFaultLog sysCarFaultLog);
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,11 +49,10 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
|
||||||
@Override
|
@Override
|
||||||
public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog) {
|
public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog) {
|
||||||
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.eq(SysCarFaultLog::getStatus,3);
|
|
||||||
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
||||||
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
||||||
}
|
}
|
||||||
return sysCarFaultLogMapper.list(sysCarFaultLog);
|
return sysCarFaultLogMapper.listStatusIgnore(sysCarFaultLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -64,22 +63,20 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
|
||||||
@Override
|
@Override
|
||||||
public List<SysCarFaultLog> listStatusProcess(SysCarFaultLog sysCarFaultLog) {
|
public List<SysCarFaultLog> listStatusProcess(SysCarFaultLog sysCarFaultLog) {
|
||||||
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.eq(SysCarFaultLog::getStatus,2);
|
|
||||||
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
||||||
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
||||||
}
|
}
|
||||||
return sysCarFaultLogMapper.list(sysCarFaultLog);
|
return sysCarFaultLogMapper.listStatusProcess(sysCarFaultLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
//只展示已解决的数据
|
//只展示已解决的数据
|
||||||
@Override
|
@Override
|
||||||
public List<SysCarFaultLog> listStatusSolve(SysCarFaultLog sysCarFaultLog) {
|
public List<SysCarFaultLog> listStatusSolve(SysCarFaultLog sysCarFaultLog) {
|
||||||
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.eq(SysCarFaultLog::getStatus,1);
|
|
||||||
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
|
||||||
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
|
||||||
}
|
}
|
||||||
return sysCarFaultLogMapper.list(sysCarFaultLog);
|
return sysCarFaultLogMapper.listStatusSolve(sysCarFaultLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue