|
@ -115,6 +115,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("vinNo", query.getName()).or().like("customerName", query.getName())); |
|
|
qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("vinNo", query.getName()).or().like("customerName", query.getName())); |
|
|
} |
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getHandoverState())) { |
|
|
|
|
|
qw.eq("handoverState", query.getHandoverState()); |
|
|
|
|
|
} |
|
|
qw.eq("useOrgSid", query.getUseOrgSid()); |
|
|
qw.eq("useOrgSid", query.getUseOrgSid()); |
|
|
qw.eq("isDelete", 0); |
|
|
qw.eq("isDelete", 0); |
|
|
qw.orderByDesc("createTime"); |
|
|
qw.orderByDesc("createTime"); |
|
@ -232,10 +235,42 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
BusVehicleInformationHandover informationHandover = fetchBySid(sid); |
|
|
BusVehicleInformationHandover informationHandover = fetchBySid(sid); |
|
|
BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo(); |
|
|
BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo(); |
|
|
BeanUtil.copyProperties(informationHandover, vo, "id", "sid"); |
|
|
BeanUtil.copyProperties(informationHandover, vo, "id", "sid"); |
|
|
|
|
|
vo.setSid(sid); |
|
|
BusVehicleInformation informationServiceByHandoverSid = busVehicleInformationService.getByHandoverSid(sid); |
|
|
BusVehicleInformation informationServiceByHandoverSid = busVehicleInformationService.getByHandoverSid(sid); |
|
|
if (null != informationServiceByHandoverSid) { |
|
|
if (null != informationServiceByHandoverSid) { |
|
|
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); |
|
|
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); |
|
|
BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); |
|
|
BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getApplyForm()) { |
|
|
|
|
|
informationVo.setApplyForm(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getCertificate()) { |
|
|
|
|
|
informationVo.setCertificate(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { |
|
|
|
|
|
informationVo.setVehicleKeyNum(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getManual()) { |
|
|
|
|
|
informationVo.setManual(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getEnvironmentalList()) { |
|
|
|
|
|
informationVo.setEnvironmentalList(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getDirverCard()) { |
|
|
|
|
|
informationVo.setDirverCard(""); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == informationServiceByHandoverSid.getGasCertificate()) { |
|
|
|
|
|
informationVo.setGasCertificate(""); |
|
|
|
|
|
} |
|
|
|
|
|
vo.setBusVehicleInformation(informationVo); |
|
|
|
|
|
} else { |
|
|
|
|
|
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); |
|
|
|
|
|
informationVo.setApplyForm(""); |
|
|
|
|
|
informationVo.setVehicleKeyNum(""); |
|
|
|
|
|
informationVo.setCertificate(""); |
|
|
|
|
|
informationVo.setManual(""); |
|
|
|
|
|
informationVo.setEnvironmentalList(""); |
|
|
|
|
|
informationVo.setDirverCard(""); |
|
|
|
|
|
informationVo.setGasCertificate(""); |
|
|
vo.setBusVehicleInformation(informationVo); |
|
|
vo.setBusVehicleInformation(informationVo); |
|
|
} |
|
|
} |
|
|
return rb.success().setData(vo); |
|
|
return rb.success().setData(vo); |
|
|