Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
commit
34e0fc34e3
  1. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  2. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  3. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -590,8 +590,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid()); int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -626,8 +626,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo(); String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid()); int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -1817,8 +1817,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid()); int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@ -1853,8 +1853,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo(); String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid()); int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@ -49,4 +49,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
List<FinVehicleInvoice> selectBybillingSid(@Param("billingSid") String billingSid); List<FinVehicleInvoice> selectBybillingSid(@Param("billingSid") String billingSid);
@Select("SELECT COUNT(*) FROM fin_vehicle_invoice WHERE vehicleSid = #{vinSid}")
int selectCountByVinSid(String vehSid);
} }

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -371,4 +371,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
} }
return rb.success(); return rb.success();
} }
public int selectCountByVinSid(String vehSid) {
return baseMapper.selectCountByVinSid(vehSid);
}
} }
Loading…
Cancel
Save