Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
commit
53b07efd3c
  1. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  2. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
@ -97,6 +98,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
private FinBillVehicleFeign finBillVehicleFeign; private FinBillVehicleFeign finBillVehicleFeign;
@Autowired @Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) { public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
if (list.size() > 0) { if (list.size() > 0) {
@ -301,6 +304,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
if (baseVehicleCertificateVo != null){ if (baseVehicleCertificateVo != null){
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState()); busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
busVehicleQKKPVo.setZcHgzImages(stringList);
} }
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData(); TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
List<TrailerVo> trailerVos = traliveredVo.getList(); List<TrailerVo> trailerVos = traliveredVo.getList();

1
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@ -107,6 +107,7 @@ public class AppRovalService {
vinListVo.setInvoiceType("机动车销售统一发票"); vinListVo.setInvoiceType("机动车销售统一发票");
vinListVo.setCertificateStateKey(busVehicleQKKPVo.getCertificateState()); vinListVo.setCertificateStateKey(busVehicleQKKPVo.getCertificateState());
vinListVo.setCertificateState(busVehicleQKKPVo.getCertificateStateValue()); vinListVo.setCertificateState(busVehicleQKKPVo.getCertificateStateValue());
vinListVo.setZcHgzImages(busVehicleQKKPVo.getZcHgzImages());
List<BusVehicleQKKPTrailerVo> trailers = busVehicleQKKPVo.getTrailers(); List<BusVehicleQKKPTrailerVo> trailers = busVehicleQKKPVo.getTrailers();
ArrayList<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>(); ArrayList<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
if (trailers != null){ if (trailers != null){

Loading…
Cancel
Save