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

优化生成合同的逻辑

master
dimengzhe 1 year ago
parent
e3742e3fc3
commit
5c0b86869b
5 changed files with 168 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  2. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  3. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
  4. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  5. 152
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -6016,7 +6016,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
if(showNotice){
// allDownloadUrl = getFileUrlNew(dto);
allDownloadUrl = getFileUrlNew(dto);
}
return allDownloadUrl;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
View File

@ -91,6 +91,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ResponseBody
public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
@ApiOperation("移动端-欠款开票点击生成附件合同")
@PostMapping("/saveAdvanceInvoicePdf")
@ResponseBody
public ResultBean saveAdvanceInvoicePdf(@Valid @RequestBody AdvanceInvoiceDto dto);
@ApiOperation("移动端-保存欠款领票申请")
@PostMapping("/saveAdvanceInvoiceLP")
@ResponseBody

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
View File

@ -78,6 +78,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
return null;
}
@Override
public ResultBean saveAdvanceInvoicePdf(AdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean saveAdvanceInvoiceLP(AdvanceInvoiceDto dto) {
return null;

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
View File

@ -85,6 +85,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);
}
@Override
public ResultBean saveAdvanceInvoicePdf(AdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoicePdf(dto);
}
@Override
public ResultBean saveAdvanceInvoiceLP(AdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoiceLP(dto);

152
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -1707,4 +1707,156 @@ public class AppBusAdvanceGinvoiceapplyService {
}
return rb;
}
public ResultBean saveAdvanceInvoicePdf(AdvanceInvoiceDto dto) {
//开票车辆信息
List<AppCarListDto> vinList = dto.getVinList();
if (vinList.isEmpty()) {
return new ResultBean().fail().setMsg("请选择车辆信息");
}
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto, "arrearsCollectionAppendxs");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
finBillApplicationDto.setUseOrgSid(useOrgSid);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setArrearsMoney(dto.getInvoiceTotal());
finBillApplicationDto.setReturnedMoneyDate(dto.getCollectionDate());
finBillApplicationDto.setArrearsOpenYYKey(dto.getReasonKey());
finBillApplicationDto.setArrearsOpenYYValue(dto.getReasonValue());
finBillApplicationDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
finBillApplicationDto.setContractNo(dto.getContractId());
finBillApplicationDto.setApplyDate(dto.getDate());
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setNodeState(dto.getNodeState());
finBillApplicationDto.setBillNo(dto.getBillNo());
finBillApplicationDto.setModelSid(dto.getModelSid());
finBillApplicationDto.setModelName(dto.getModelName());
finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
String publishInfo = dto.getPublishInfo();
String[] split = publishInfo.split("-");
finBillApplicationDto.setDeptName(split[0]);
finBillApplicationDto.setCreateByName(split[1]);
//开票车辆信息
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
for (AppCarListDto vinListDto : vinList) {
if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){
return new ResultBean().fail().setMsg("开票信息不能为空");
}
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVin());
finBillVehicleDto.setVehSid(vinListDto.getVinSid());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
finBillVehicleDtos.add(finBillVehicleDto);
}
finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);
//开票挂车信息
List<com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
if (finBillTrailers != null && finBillTrailers.size() > 0) {
for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) {
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
finBillTrailerDtos.add(finBillTrailerDto);
}
}
finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
//附件信息
List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = dto.getIdCardImages();//证件
List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
List<String> zrrdbcns = dto.getZrrdbcns();
List<String> zfxsjt = dto.getZfxsjt();
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
List<FinBillFileDto> qklpfjImages = new ArrayList<>();
List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
List<FinBillFileDto> pczfxsjt = new ArrayList<>();
if (customerInvoiceApplyImages != null) {
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(customerInvoiceApplyImage);
khkpsqsApplicationAppendxs.add(finBillFileDto);
}
}
if (invoiceApplyConfirmImages != null) {
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
kpxxqrsApplicationAppendxs.add(finBillFileDto);
}
}
if (registerContractImages != null) {
for (String registerContractImage : registerContractImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(registerContractImage);
cldjhtApplicationAppendxs.add(finBillFileDto);
}
}
if (idCardImages != null) {
for (String idCardImage : idCardImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(idCardImage);
idCardImagesPC.add(finBillFileDto);
}
}
if (arrearsCollectionAppendxs != null) {
for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(arrearsCollectionAppendx);
qklpfjImages.add(finBillFileDto);
}
}
if (gsgdhdwdbjy != null) {
for (String gsgdhdwdb : gsgdhdwdbjy) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(gsgdhdwdb);
pcgsgdhdwdbjy.add(finBillFileDto);
}
}
if (zrrdbcns != null) {
for (String zrrdbcn : zrrdbcns) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zrrdbcn);
pczrrdbcns.add(finBillFileDto);
}
}
if (zfxsjt != null) {
for (String zfxs : zfxsjt) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zfxs);
pczfxsjt.add(finBillFileDto);
}
}
finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages);
finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
finBillApplicationDto.setPczrrdbcns(pczrrdbcns);
finBillApplicationDto.setPczfxsjt(pczfxsjt);
ResultBean resultBean = finBillApplicationFeign.saveInvoicedApplyInfoPdfQk(finBillApplicationDto);
return resultBean;
}
}
Write Preview
Loading…
Cancel
Save