yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
031d610bd2 6c6d8d66b9
commit
0a30b4c383
1 changed files with 26 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

50
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -285,31 +285,33 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
} }
} }
for (VinListsVo vinListsVo : vinListsVos) { for (VinListsVo vinListsVo : vinListsVos) {
BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo(); if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
String vinSid = vinListsVo.getVinSid(); BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
if (spVehSids.contains(vinSid)){ String vinSid = vinListsVo.getVinSid();
continue; if (spVehSids.contains(vinSid)){
} continue;
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData(); }
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData(); BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
busSalesOrderReturnVehDetailsVo.setVehSid(vinSid); BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo()); busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey()); busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor()); busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
if (baseVehicleCertificateVo != null){ busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState()); if (baseVehicleCertificateVo != null){
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
}else { busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-"); }else {
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-"); busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
}
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
} }
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
} }
if (busSalesOrderReturnVehApplyECTJ != null){ if (busSalesOrderReturnVehApplyECTJ != null){
if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")){ if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")){

Write Preview
Loading…
Cancel
Save