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

欠款提车附件整合成一个

master
dimengzhe 2 years ago
parent
af2397f18d
commit
69dbda312b
9 changed files with 111 additions and 40 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. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
  4. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/DownloadUrlVo.java
  5. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java
  6. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
  7. 137
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  8. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
  9. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderQuery.java

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java
View File

@ -124,6 +124,7 @@ public class AppArrearsCarryInfoVo implements Vo {
private String guaranteeLetterDownloadUrl;
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String allDownloadUrl;
@ApiModelProperty("组织全路径")
private String orgPath;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
View File

@ -101,7 +101,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ApiOperation("点击生成附件")
@PostMapping("/saveArrearsApplyPdf")
@ResponseBody
public ResultBean saveArrearsApplyPdf(@Valid @RequestBody AppArrearsCarryDto dto);
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(@Valid @RequestBody AppArrearsCarryDto dto);
@ApiOperation("手机端-删除欠款提车")
@DeleteMapping("/deleteArrearsTakeCar")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
View File

@ -97,7 +97,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
}
@Override
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
return null;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/DownloadUrlVo.java
View File

@ -20,4 +20,6 @@ public class DownloadUrlVo {
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String sid;
@ApiModelProperty("整体附件下载地址")
private String allDownloadUrl;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java
View File

@ -23,6 +23,7 @@ public enum BuscenterFileEnum {
GUARANTEELETTER_DOWNLOADURL("014", "欠款提车担保承诺书"),
GDLETTER_DOWNLOADURL("015", "股东会对外担保决议"),
ZJLLETTER_DOWNLOADURL("016", "总经理担保书"),
TCALL_DOWNLOADURL("018", "欠款提车附件"),
DISCOUNTPACKAGE_HANDOVER("017","优惠包交接确认")
;

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
View File

@ -183,7 +183,7 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
}
@Override
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
return busArrearsCarryVehicleApplyService.saveArrearsApplyPdf(dto);
}

137
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -689,6 +689,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getCarContractFile())) {
List<String> carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(","));
carContract = carContract.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
@ -784,6 +788,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
String guaranteeLetterDownloadUrl = "";
String zjlLetterDownloadUrl = "";
String gdLetterDownloadUrl = "";
String allDownloadUrl = "";
//新增生成附件（新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、股东会对外担保决议）
//车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
//回购日期发生变化，重新生成欠款提车担保承诺书
@ -797,34 +802,60 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//生成股东会对外担保决议
gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
PdfVo pdfVo = new PdfVo();
List<File> filesList = new ArrayList<>();
if(StringUtils.isNotBlank(carContractDownloadUrl)){
pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
pdfVo.setDownUrl(carContractDownloadUrl);
list.add(pdfVo);
// pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(carContractDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(gdLetterDownloadUrl)){
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(gdLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(gdLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(zjlLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(zjlLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
String urlAll = "";
if (filesList.size() > 0) {
String typeName = "欠款提车附件" + ".pdf";
try {
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
pdfVo.setType(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.TCALL_DOWNLOADURL.getMark());
list.add(pdfVo);
}
@ -873,34 +904,61 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
//新车买卖合同（欠款）
PdfVo pdfVo = new PdfVo();
List<File> filesList = new ArrayList<>();
if (StringUtils.isNotBlank(carContractDownloadUrl)) {
pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
pdfVo.setDownUrl(carContractDownloadUrl);
list.add(pdfVo);
// pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(carContractDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if (StringUtils.isNotBlank(gdLetterDownloadUrl)) {
//股东会对外担保决议
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(gdLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(gdLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
//总经理担保书
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(zjlLetterDownloadUrl);
list.add(pdfVo);
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(zjlLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
//欠款提车担保承诺书
// pdfVo = new PdfVo();
// pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
// pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
// pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
// list.add(pdfVo);
File file = new File(docPdfComponent.getUploadTemplateUrl() + carContractDownloadUrl);
filesList.add(file);
}
String urlAll = "";
if (filesList.size() > 0) {
String typeName = "欠款提车附件" + ".pdf";
try {
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
pdfVo = new PdfVo();
pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
pdfVo.setType(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
pdfVo.setName(BuscenterFileEnum.TCALL_DOWNLOADURL.getMark());
pdfVo.setDownUrl(urlAll);
list.add(pdfVo);
}
}
@ -2088,8 +2146,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
ResultBean rb = ResultBean.fireFail();
public ResultBean<DownloadUrlVo> saveArrearsApplyPdf(AppArrearsCarryDto dto) {
ResultBean<DownloadUrlVo> rb = ResultBean.fireFail();
DownloadUrlVo downloadUrlVo = new DownloadUrlVo();
ResultBean<CreatePdfVo> resultBean = saveArrearsApply(dto);
if (!resultBean.getSuccess()) {
@ -2112,6 +2170,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType().equals(pdfVo.getType())) {
downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
}
if(BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType().equals(pdfVo.getType())){
downloadUrlVo.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
}
}
if (resultBean.getData().isChange() || resultBean.getData().isDateChange()) {
return rb.success().setData(downloadUrlVo).setMsg("附件已发生变化，可下载最新附件");
@ -2195,6 +2256,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (buscenterFile != null) {
appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.TCALL_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getCarContractFile())) {
List<String> carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(","));
carContract = carContract.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
View File

@ -133,6 +133,8 @@ public class AdvanceArrearsInfoVo implements Vo {
@ApiModelProperty("股东会对外担保决议下载地址")
private String gdLetterDownloadUrl;
private String allDownloadUrl;
@ApiModelProperty("组织全路径")
private String orgPath;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderQuery.java
View File

@ -21,6 +21,6 @@ public class BusOrderQuery implements Query {
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
}

Write Preview
Loading…
Cancel
Save