diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index fd7e109489..4b9bd037bf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -308,7 +308,7 @@ WHERE busState = '401' - AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1'))) AND bbv.vehicleState != '0002' + AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and finState = '1' and manageState = '1'))) AND bbv.vehicleState != '0002' order by bo.contractNo desc,bv.id desc) a @@ -447,7 +447,7 @@ anrui_base.base_vehicle_state WHERE busState = '401' - AND (saleTypeKey = '2' and invoiceApplyState = '1')) + AND (saleTypeKey = '2' and finState = '1' and manageState = '1')) AND bbv.vehicleState != '0002' GROUP BY diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index ed4765e526..bdcc85402e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -416,27 +416,6 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList = dto.getDetailsList(); - for (BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto : detailsList) { - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractNo(), busDeliveredApplyDetailsDto.getVinSid()); - BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData(); - if (!"1".equals(baseVehicleState.getFinState())){ - return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "款项未交清,保存失败"); - } - if ("3".equals(baseVehicleState.getFinSourceKey())){//非担保 - String investigateValue = loanHomevisitInvestigateFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); - if (!"通过".equals(investigateValue)){ - return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访考察未通过,保存失败"); - } - }else if ("4".equals(baseVehicleState.getFinSourceKey())){//担保 - String state = loanHomevisitFileexamineFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); - if (!"2".equals(state)){ - return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访资料审核未通过,保存失败"); - } - } - } - } //新增 BusDeliveredApply busDeliveredApply = new BusDeliveredApply(); BeanUtil.copyProperties(dto, busDeliveredApply, "sid");