Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
56e9bc49a7
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java
  4. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  5. BIN
      anrui-base/anrui-base-biz/src/main/resources/static/excel/调价申请模板.xls
  6. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  7. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
  8. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java
  9. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java
  10. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java
  11. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java
  12. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java
  13. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverDto.java
  14. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java
  15. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
  16. 87
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  17. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java
  18. 74
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
  19. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  20. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  21. 43
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  22. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehicleinvoice/LoanVehicleInvoiceFeign.java
  24. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  25. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  26. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
  27. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java
  28. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java
  29. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java
  30. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversDto.java
  31. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java
  32. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java
  33. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java
  34. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java
  35. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java
  36. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  37. 9
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  38. 51
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java
  39. 102
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java
  40. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java

@ -116,14 +116,14 @@ public interface BaseModelModpriceFeign {
@ResponseBody
public ResultBean<BaseModelModpriceImportReturn> getExcelInfo(@RequestParam("sid") String sid, @RequestParam("file") MultipartFile file, HttpServletRequest request)throws IOException,ParseException;
@PostMapping("/downloadExcel")
@PostMapping("/downloadModPriceExcel")
@ApiOperation(value = "下载模板")
@ResponseBody
public void downloadExcel();
@ApiOperation(value = "下载模板")
@GetMapping("/downloadModPriceExcel")
public void downloadModPriceExcel(HttpServletResponse response);
@PostMapping("/downloadExcel")
public void downloadModPriceExcel();
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java

@ -126,7 +126,7 @@ public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign {
}
@Override
public void downloadModPriceExcel(HttpServletResponse response) {
public void downloadModPriceExcel() {
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java

@ -169,7 +169,7 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign {
}
@Override
public void downloadModPriceExcel(HttpServletResponse response) {
public void downloadModPriceExcel() {
try {
InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/excel/调价申请模板.xls");
//获取要下载的模板名称

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -704,10 +704,10 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
}
}
//判断销售指导价是不是数字
if (!isNum(importVo.getGuidedPrice()) && StringUtils.isNotBlank(importVo.getGuidedPrice())) {
if (!isNumericFirst(importVo.getGuidedPrice()) && StringUtils.isNotBlank(importVo.getGuidedPrice())) {
sb.append("第" + importVo.getRankNo() + "行调整后全款销售指导价(元)不是数字格式").append(";");
}
if (!isNum(importVo.getManufactorSettlementPrice()) && StringUtils.isNotBlank(importVo.getManufactorSettlementPrice())) {
if (!isNumericFirst(importVo.getManufactorSettlementPrice()) && StringUtils.isNotBlank(importVo.getManufactorSettlementPrice())) {
sb.append("第" + importVo.getRankNo() + "行调整后贷款销售指导价(元)不是数字格式").append(";");
}
if (importVoMap.containsKey(importVo.getVehicleTypeCode() + importVo.getConfigCode())) {

BIN
anrui-base/anrui-base-biz/src/main/resources/static/excel/调价申请模板.xls

Binary file not shown.

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@ -103,6 +103,11 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ResponseBody
public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
@ApiOperation("详情")
@GetMapping("/details")
@ResponseBody
ResultBean<AppArrearsCarryInfoVo> details(@RequestParam("sid")String sid);
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceArrearsInfo")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@ -101,6 +101,11 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
return null;
}
@Override
public ResultBean<AppArrearsCarryInfoVo> details(String sid) {
return null;
}
@Override
public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java

@ -12,7 +12,6 @@ import lombok.Data;
@Data
public class BuscenterFile extends BaseEntity {
private static final long serialVersionUID = -1625798325169874963L;
@ApiModelProperty("关联sid")
private String linkSid;
@ApiModelProperty("文件类型")

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

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

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java

@ -1,6 +1,7 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
@ -62,6 +63,6 @@ public class BusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFileDto> busFiles;
private List<BuscenterFile> busFiles;
}

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@ -1,6 +1,6 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
@ -72,15 +72,15 @@ public interface BusDiscountpackageHandoverFeign {
@ApiOperation("移动端优惠包交接详情编辑回显")
@GetMapping("/getDiscountHandoverInfo/{sid}")
@ResponseBody
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
public ResultBean<AppBusDiscountpackageHandoverDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
@ApiOperation("移动端交接操作")
@PostMapping("/todoPackageHandover")
@ResponseBody
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
@ApiOperation(("上传图片"))
@PostMapping("/appUploadPicture")
public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandocerDto dto);
public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandoverDto dto);
}

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java

@ -1,6 +1,6 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
@ -67,17 +67,17 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka
}
@Override
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(String sid) {
public ResultBean<AppBusDiscountpackageHandoverDto> getDiscountHandoverInfo(String sid) {
return null;
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
public ResultBean todoPackageHandover(AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
return null;
}
@Override
public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
public ResultBean appUploadPicture(AppBusDiscountpackageHandoverDto dto) {
return null;
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverDto.java

@ -1,6 +1,7 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.common.core.dto.Dto;
@ -16,7 +17,7 @@ import java.util.List;
* @date 2023/4/25 16:47
*/
@Data
public class AppBusDiscountpackageHandocerDto implements Dto {
public class AppBusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ -50,6 +51,6 @@ public class AppBusDiscountpackageHandocerDto implements Dto {
@ApiModelProperty("优惠包交接优惠包列表")
private List<AppBusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFileDto> busFiles;
private List<BuscenterFile> busFiles;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java

@ -15,7 +15,6 @@ import java.util.List;
@Data
public class BusHandoverDetailsVo implements Vo {
private static final long serialVersionUID = -19660212281955914L;
@ApiModelProperty("记录sid")
private String sid;
@ApiModelProperty("合同编号")

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@ -148,8 +148,6 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
*//**
* 欠款提车单附件保存接口
*
* @param list
* @return
*//*
@Override
public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> list) {
@ -188,6 +186,11 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);
}
@Override
public ResultBean<AppArrearsCarryInfoVo> details(String sid) {
return busArrearsCarryVehicleApplyService.details(sid);
}
@Override
public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
return busArrearsCarryVehicleApplyService.submitAdvanceArrearsInfo(dto);

87
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -1878,4 +1878,91 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
public int selectBySids(String join) {
return baseMapper.selectBySids(join);
}
public ResultBean<AppArrearsCarryInfoVo> details(String sid) {
ResultBean<AppArrearsCarryInfoVo> rb = ResultBean.fireFail();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(sid);
if(busArrearsCarryVehicleApply != null){
return rb.setMsg("欠款提车申请不存在");
}
AppArrearsCarryInfoVo appArrearsCarryInfoVo = new AppArrearsCarryInfoVo();
BeanUtil.copyProperties(busArrearsCarryVehicleApply, appArrearsCarryInfoVo, "sid");
appArrearsCarryInfoVo.setSid(sid);
appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo());
appArrearsCarryInfoVo.setPublishInfo(busArrearsCarryVehicleApply.getApplyDept() + "-" + busArrearsCarryVehicleApply.getApplyName());
appArrearsCarryInfoVo.setCreateDate(DateUtil.format(busArrearsCarryVehicleApply.getCreateTime(), "yyyy-MM-dd"));
appArrearsCarryInfoVo.setOrgPath(busArrearsCarryVehicleApply.getOrgSidPath());
List<BusArrearsCarryVehicleDetails> detailsList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(sid);
List<AdCarListVo> voList = new ArrayList<>();
detailsList.removeAll(Collections.singleton(null));
if (!detailsList.isEmpty()) {
for (int i = 0; i < detailsList.size(); i++) {
AdCarListVo adCarListVo = new AdCarListVo();
BeanUtil.copyProperties(detailsList.get(i), adCarListVo);
adCarListVo.setCarSid(detailsList.get(i).getVinSid());
adCarListVo.setVin(detailsList.get(i).getVinNo());
voList.add(adCarListVo);
}
}
appArrearsCarryInfoVo.setVinList(voList);
voList.removeAll(Collections.singleton(null));
if (!voList.isEmpty()) {
List<GCarListVo> trailersList = new ArrayList<>();
for (int i = 0; i < voList.size(); i++) {
AdCarListVo adCarListVo = voList.get(i);
ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(adCarListVo.getCarSid(), busArrearsCarryVehicleApply.getContractNo());
if (voResultBean.getData() != null) {
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(adCarListVo.getCarSid(), busArrearsCarryVehicleApply.getContractNo()).getData();
List<TrailerVo> trailerVos = traliveredVo.getList();
if (!trailerVos.isEmpty()) {
for (TrailerVo trailerVo : trailerVos) {
GCarListVo gCarListVo = new GCarListVo();
gCarListVo.setVinNo(traliveredVo.getVinNo());
gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
gCarListVo.setPrice(trailerVo.getDealPrice());
trailersList.add(gCarListVo);
}
appArrearsCarryInfoVo.setTrailersList(trailersList);
}
}
}
}
BuscenterFile buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setCarContractDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setGuaranteeLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
if (buscenterFile != null) {
appArrearsCarryInfoVo.setGdLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
}
buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.ZJLLETTER_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());
appArrearsCarryInfoVo.setCarContract(carContract);
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getGuaranteeLetterFile())) {
List<String> guaranteeLetter = Arrays.asList(busArrearsCarryVehicleApply.getGuaranteeLetterFile().split(","));
guaranteeLetter = guaranteeLetter.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
appArrearsCarryInfoVo.setGuaranteeLetter(guaranteeLetter);
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getGdLetterFile())) {
List<String> gdLetter = Arrays.asList(busArrearsCarryVehicleApply.getGdLetterFile().split(","));
gdLetter = gdLetter.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
appArrearsCarryInfoVo.setGdLetter(gdLetter);
}
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getZjlLetterFile())) {
List<String> zjlLetter = Arrays.asList(busArrearsCarryVehicleApply.getZjlLetterFile().split(","));
zjlLetter = zjlLetter.stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
appArrearsCarryInfoVo.setZjlLetter(zjlLetter);
}
return rb.success().setData(appArrearsCarryInfoVo);
}
}

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@ -1,7 +1,7 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
@ -82,12 +82,8 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
@Override
public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail();
boolean isUpload = busDiscountpackageHandoverService.uploadPicture(dto);
if (isUpload) {
return rb.success().setMsg("上传成功");
} else {
return rb.fail().setMsg("上传失败");
}
busDiscountpackageHandoverService.uploadPicture(dto);
return rb.success();
}
/********************移动端接口**********************/
@ -99,14 +95,14 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
}
@Override
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
public ResultBean<AppBusDiscountpackageHandoverDto> getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
AppBusDiscountpackageHandocerDto dto = busDiscountpackageHandoverService.getDiscountHandoverInfo(sid);
AppBusDiscountpackageHandoverDto dto = busDiscountpackageHandoverService.getDiscountHandoverInfo(sid);
return rb.success().setData(dto);
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
public ResultBean todoPackageHandover(AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
int i = busDiscountpackageHandoverService.todoPackageHandover(dto);
@ -117,13 +113,9 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
}
@Override
public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
public ResultBean appUploadPicture(AppBusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail();
boolean isUpload = busDiscountpackageHandoverService.appUploadPicture(dto);
if (isUpload) {
return rb.success().setMsg("上传成功");
} else {
return rb.fail().setMsg("上传失败");
}
busDiscountpackageHandoverService.appUploadPicture(dto);
return rb.success();
}
}

74
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@ -5,17 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
import com.yxt.anrui.portal.api.sysrole.SysRoleFeign;
import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.common.base.config.component.DocPdfComponent;
@ -53,7 +53,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BusFileService busFileService;
private BuscenterFileService buscenterFileService;
@Autowired
private DocPdfComponent docPdfComponent;
@Autowired
@ -232,14 +232,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
}
}
//根据关联sid查询图片
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<BuscenterFile> buscenterFiles = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
List<BusDiscountpackageHandoverListDto> lists = this.returnHandoverListVo(sid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != busFileDtos) {
for (BusFileDto busFileDto : busFileDtos) {
busFileDto.setFilePath(urlPrefix + busFileDto.getFilePath());
if (null != buscenterFiles) {
for (BuscenterFile buscenterFile : buscenterFiles) {
buscenterFile.setFilePath(urlPrefix + buscenterFile.getFilePath());
}
dto.setBusFiles(busFileDtos);
dto.setBusFiles(buscenterFiles);
}
dto.setBusDiscountpackageHandoverLists(lists);
return dto;
@ -271,7 +271,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
if (StringUtils.isNotBlank(dto.getState())) {
i = this.updateBySid(dto.toMap(), sid);
}
List<BusFileDto> busFiles = dto.getBusFiles();
List<BuscenterFile> busFiles = dto.getBusFiles();
if (null != busFiles && i > 0) {
this.uploadPicture(dto);
}
@ -478,23 +478,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
* @param dto
* @return
*/
public boolean uploadPicture(BusDiscountpackageHandoverDto dto) {
boolean isSuccess = false;
public void uploadPicture(BusDiscountpackageHandoverDto dto) {
String sid = dto.getSid();
BusDiscountpackageHandover bh = this.fetchById(sid);
if (null != dto.getBusFiles()) {
List<BusFileDto> busFiles = dto.getBusFiles();
for (BusFileDto busFile : busFiles) {
BusFile bf = new BusFile();
busFile.setLinkSid(sid);
String uploadPath = fileUploadComponent.getUrlPrefix();
String substring = busFile.getFilePath().substring(uploadPath.length());
busFile.setFilePath(substring);
busFile.fillEntity(bf);
isSuccess = busFileService.save(bf);
List<BuscenterFile> busFiles = dto.getBusFiles();
for (BuscenterFile busFile : busFiles) {
buscenterFileService.saveFile(sid, busFile.getFilePath(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
}
}
return isSuccess;
}
@ -560,8 +551,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
* @param sid
* @return
*/
public AppBusDiscountpackageHandocerDto getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
AppBusDiscountpackageHandocerDto dto = new AppBusDiscountpackageHandocerDto();
public AppBusDiscountpackageHandoverDto getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
AppBusDiscountpackageHandoverDto dto = new AppBusDiscountpackageHandoverDto();
StringBuilder sb = new StringBuilder();
dto.setSid(sid);
//根据待交接sid查询
@ -600,7 +591,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
}
}
//根据关联sid查询图片
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<BuscenterFile> buscenterFiles = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
List<BusDiscountpackageHandoverListDto> lists = this.returnHandoverListVo(sid);
List<AppBusDiscountpackageHandoverListDto> appListDtos = new ArrayList<>();
if (null != lists) {
@ -619,11 +610,11 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
}
}
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != busFileDtos) {
for (BusFileDto busFileDto : busFileDtos) {
busFileDto.setFilePath(urlPrefix + busFileDto.getFilePath());
if (null != buscenterFiles) {
for (BuscenterFile buscenterFile : buscenterFiles) {
buscenterFile.setFilePath(urlPrefix + buscenterFile.getFilePath());
}
dto.setBusFiles(busFileDtos);
dto.setBusFiles(buscenterFiles);
}
dto.setBusDiscountpackageHandoverLists(appListDtos);
return dto;
@ -635,7 +626,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
* @param dto
* @return
*/
public int todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws InvocationTargetException, IllegalAccessException, ParseException {
public int todoPackageHandover(AppBusDiscountpackageHandoverDto dto) throws InvocationTargetException, IllegalAccessException, ParseException {
String sid = dto.getSid();
int i = 0;
BusDiscountpackageHandoverDto bdhDto = new BusDiscountpackageHandoverDto();
@ -646,7 +638,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
bdhDto.setRecTime(currentDate);
List<BusFileDto> busFiles = bdhDto.getBusFiles();
List<BuscenterFile> busFiles = bdhDto.getBusFiles();
if (StringUtils.isNotBlank(bdhDto.getState())) {
i = this.updateBySid(bdhDto.toMap(), sid);
}
@ -675,21 +667,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
* @param dto
* @return
*/
public boolean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
boolean isSuccess = false;
public void appUploadPicture(AppBusDiscountpackageHandoverDto dto) {
String sid = dto.getSid();
if (null != dto.getBusFiles()) {
List<BusFileDto> busFiles = dto.getBusFiles();
for (BusFileDto busFile : busFiles) {
BusFile bf = new BusFile();
busFile.setLinkSid(sid);
String uploadPath = fileUploadComponent.getUrlPrefix();
String substring = busFile.getFilePath().substring(uploadPath.length());
busFile.setFilePath(substring);
busFile.fillEntity(bf);
isSuccess = busFileService.save(bf);
List<BuscenterFile> busFiles = dto.getBusFiles();
for (BuscenterFile busFile : busFiles) {
buscenterFileService.saveFile(sid, busFile.getFilePath(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
}
}
return isSuccess;
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@ -86,7 +86,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
@Select("select * from fin_uncollected_receivables_detailed where contractNo = #{contractId}")
List<FinUncollectedReceivablesDetailed> fetchByContractNo(String contractId);
FinUncollectedReceivablesDetailedPdfVo selectPdf(String detailedSid);
FinUncollectedReceivablesDetailedPdfVo selectPdf(@Param("detailedSid") String detailedSid);
List<ReceiveSeleteVo> receivedSelect(String busVinSid);
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@ -103,6 +103,7 @@
from fin_uncollected_receivables_detailed
where contractNo = #{contractNo}
</select>
<select id="selectPdf"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedPdfVo">
SELECT fu.busVinSid,
@ -119,7 +120,6 @@
where fu.sid = #{detailedSid}
AND fs.auditState = 3
ORDER BY fc.confirmDate DESC limit 1
</select>
<select id="receivedSelect" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo">

43
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -63,6 +63,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hpsf.Decimal;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -370,26 +371,28 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
BigDecimal reveivableMoney = new BigDecimal(record.getReveivableMoney());
BigDecimal noSubscriptionMoney = reveivableMoney.subtract(sum);
record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
FinUncollectedReceivablesDetailedPdfVo pdfVo = baseMapper.selectPdf(sid);
if (null != pdfVo) {
String busVinSid = pdfVo.getBusVinSid();
BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData();
if (null != data) {
String salesOrderSid = data.getSalesOrderSid();
String linkNo = data.getLinkNo();
if (linkNo.length() > 8) {
String substringLinkNo = linkNo.substring(linkNo.length() - 8);
record.setVinNo(substringLinkNo);
} else {
record.setVinNo(linkNo);
}
String busVinSid = record.getBusVinSid();
BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData();
if (null != data) {
String salesOrderSid = data.getSalesOrderSid();
String linkNo = data.getLinkNo();
if (linkNo.length() > 8) {
String substringLinkNo = linkNo.substring(linkNo.length() - 8);
record.setVinNo(substringLinkNo);
} else {
record.setVinNo(linkNo);
}
FinUncollectedReceivablesDetailedPdfVo pdfVo = baseMapper.selectPdf(sid);
if (null != pdfVo) {
//根据销售订单编号查询金融方案 分别取出保证金
SolutionsDetailsVo svo = loanSolutionsFeign.selectDetails(salesOrderSid).getData();
if (null != svo) {
if (StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts())
|| StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium())
|| StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle())) {
record.setDownload(true);
if (noSubscriptionMoney.compareTo(BigDecimal.ZERO) <= 0) {
if (null != svo) {
if (StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts())
|| StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium())
|| StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle())) {
record.setDownload(true);
}
}
}
}
@ -757,9 +760,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
receiveInvoiceVo.setReceiveSeleteVoList(receiveSeleteVoList);
//根据车辆sid查询该车辆的发票信息
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(vinSid);
if(finVehicleInvoice != null){
if (finVehicleInvoice != null) {
InvoiceVo invoiceVo = new InvoiceVo();
BeanUtils.copyProperties(finVehicleInvoice,invoiceVo);
BeanUtils.copyProperties(finVehicleInvoice, invoiceVo);
receiveInvoiceVo.setInvoiceVo(invoiceVo);
}
return rb.success().setData(receiveInvoiceVo);

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java

@ -20,7 +20,6 @@ public class SolutionsDetailsVo implements Vo {
private String salesOrderSid;
//金融方案主表
@ApiModelProperty("类型:01自营非担保,02外部金融")
private String type;
@ApiModelProperty("类型:01自营非担保,02外部金融")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehicleinvoice/LoanVehicleInvoiceFeign.java

@ -59,7 +59,7 @@ public interface LoanVehicleInvoiceFeign {
@GetMapping("/fetch/{id}")
public ResultBean<LoanVehicleInvoiceVo> fetch(@PathVariable("id") String id);
@ApiOperation("获取一条记录")
@ApiOperation("获取一条记录")
@GetMapping("/fetchSid/{sid}")
public ResultBean<LoanVehicleInvoice> fetchBySid(@PathVariable("sid") String sid);
}

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.List;

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@ -77,9 +77,9 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
@ApiOperation("手机端-欠款开票详情")
@GetMapping("/detailAdvancelnvoice")
@GetMapping("/detailAdvanceInvoice")
@ResponseBody
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(@RequestParam("sid") String sid);
public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(@RequestParam("sid") String sid);
@ApiOperation("移动端-保存欠款开票申请")
@PostMapping("/saveAdvanceInvoice")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@ -67,7 +67,7 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
}
@Override
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(String sid) {
return null;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java

@ -10,10 +10,14 @@ public class AppCarListVo implements Vo {
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("车辆sid")
private String vinSid;
@ApiModelProperty("开票类型key")
private String invoiceTypeKey;
@ApiModelProperty("开票类型value")
private String invoiceType;
@ApiModelProperty("开票名称sid")
private String openTickSid;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票信息")

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@ -77,6 +77,11 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
@ResponseBody
public ResultBean deleteArrearsTakeCar(@SpringQueryMap AdvanceArrearsInfoQuery query);
@ApiOperation("欠款提车详情")
@GetMapping("/details")
@ResponseBody
public ResultBean<AdvanceArrearsInfoVo> details(@RequestParam("sid") String sid);
/******************************流程接口*************************************/
@ApiOperation("提交流程")

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@ -62,6 +62,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
return null;
}
@Override
public ResultBean<AdvanceArrearsInfoVo> details(String sid) {
return null;
}
@Override
public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) {
return null;

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandocersDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversDto.java

@ -14,7 +14,7 @@ import java.util.List;
* @date 2023/4/25 16:47
*/
@Data
public class AppBusDiscountpackageHandocersDto implements Dto {
public class AppBusDiscountpackageHandoversDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ -48,6 +48,6 @@ public class AppBusDiscountpackageHandocersDto implements Dto {
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoversListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFilesDto> busFiles;
private List<AppBuscenterFile> busFiles;
}

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusFilesDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java

@ -13,12 +13,7 @@ import java.util.Date;
* @date 2023/4/25 17:01
*/
@Data
public class BusFilesDto implements Dto {
@ApiModelProperty("上传人sid")
private String createBySid;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("上传时间")
private Date createTime;
public class AppBuscenterFile {
@ApiModelProperty("关联sid")
private String linkSid;
@ApiModelProperty("文件类型")
@ -31,6 +26,4 @@ public class BusFilesDto implements Dto {
private String fileSize;
@ApiModelProperty("文件路径")
private String filePath;
@ApiModelProperty("上传人姓名")
private String name;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java

@ -34,16 +34,16 @@ public interface AppDiscountPackageHandoverFegin {
@ApiOperation("移动端优惠包交接详情编辑回显")
@GetMapping("/getDiscountHandoverInfo/{sid}")
@ResponseBody
public ResultBean<AppBusDiscountpackageHandocersDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
public ResultBean<AppBusDiscountpackageHandoversDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
@ApiOperation("移动端交接操作")
@PostMapping("/todoPackageHandover")
@ResponseBody
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandocersDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandoversDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
@ApiOperation(("上传图片"))
@PostMapping("/uploadPicture")
@ResponseBody
public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandocersDto dto) throws InvocationTargetException, IllegalAccessException;
public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java

@ -19,17 +19,17 @@ public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPacka
}
@Override
public ResultBean<AppBusDiscountpackageHandocersDto> getDiscountHandoverInfo(String sid) {
public ResultBean<AppBusDiscountpackageHandoversDto> getDiscountHandoverInfo(String sid) {
return null;
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocersDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
public ResultBean todoPackageHandover(AppBusDiscountpackageHandoversDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
return null;
}
@Override
public ResultBean uploadPicture(AppBusDiscountpackageHandocersDto dto) {
public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) {
return null;
}
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@ -77,6 +77,11 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);
}
@Override
public ResultBean<AdvanceArrearsInfoVo> details(String sid) {
return appBusArrearsCarryVehicleApplyService.details(sid);
}
/******************************************流程接口********************************************/
@Override

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@ -248,4 +248,15 @@ public class AppBusArrearsCarryVehicleApplyService {
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApplyPdf(appArrearsCarryDto);
return resultBean;
}
public ResultBean<AdvanceArrearsInfoVo> details(String sid) {
ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();
AdvanceArrearsInfoVo advanceArrearsInfoVo = new AdvanceArrearsInfoVo();
ResultBean<AppArrearsCarryInfoVo> resultBean = busArrearsCarryVehicleApplyFeign.details(sid);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
BeanUtil.copyProperties(resultBean.getData(),advanceArrearsInfoVo);
return rb.success().setData(advanceArrearsInfoVo);
}
}

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@ -74,8 +74,8 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
}
@Override
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
return appBusAdvanceGinvoiceapplyService.detailAdvancelnvoice(sid);
public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(String sid) {
return appBusAdvanceGinvoiceapplyService.detailAdvanceInvoice(sid);
}
@Override

9
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -184,10 +184,12 @@ public class AppBusAdvanceGinvoiceapplyService {
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setVinSid(finBillVehicle.getVehSid());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
@ -382,6 +384,7 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());
submitAdvanceInvoiceDto.setOpenTickName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setContractNo(dto.getContractId());
submitAdvanceInvoiceDto.setApplyDate(dto.getDate());
@ -578,7 +581,7 @@ public class AppBusAdvanceGinvoiceapplyService {
return rb.success().setData(data);
}
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(String sid) {
ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
@ -594,7 +597,7 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
@ -615,10 +618,12 @@ public class AppBusAdvanceGinvoiceapplyService {
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setVinSid(finBillVehicle.getVehSid());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);

51
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java

@ -0,0 +1,51 @@
package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppDiscountPackageHandoverFegin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
/**
* @author Administrator
* @description
* @date 2023/4/25 10:26
*/
@Api(tags = "优惠包交接管理")
@RestController
@RequestMapping("/autoservice/v1/discountPackageHandover")
public class AppDiscountPackageHandoverRest implements AppDiscountPackageHandoverFegin {
@Autowired
private AppDiscountPackageHandoverService appDiscountPackageHandoverService;
@Override
public ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> listPage(PagerQuery<AppBusDiscountpackageHandoversQuery> pq) {
return appDiscountPackageHandoverService.listPage(pq);
}
@Override
public ResultBean<AppBusDiscountpackageHandoversDto> getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
return appDiscountPackageHandoverService.getDiscountHandoverInfo(sid);
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandoversDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
return appDiscountPackageHandoverService.todoPackageHandover(dto);
}
@Override
public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException {
return appDiscountPackageHandoverService.uploadPicture(dto);
}
}

102
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java

@ -0,0 +1,102 @@
package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery;
import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* @author Administrator
* @description
* @date 2023/4/25 10:26
*/
@Service
public class AppDiscountPackageHandoverService {
@Autowired
private BusDiscountpackageHandoverFeign busDiscountpackageHandoverFeign;
/**
* 移动端交接管理分页
*
* @param pagerQuery
* @return
*/
public ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> listPage(PagerQuery<AppBusDiscountpackageHandoversQuery> pagerQuery) {
ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> rb = ResultBean.fireFail();
PagerQuery<AppBusDiscountpackageHandoverQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> resultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq);
System.out.println(resultBean.getData().getRecords());
List<AppBusDiscountpackageHandoversVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppBusDiscountpackageHandoversVo.class)).collect(Collectors.toList());
PagerVo<AppBusDiscountpackageHandoversVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}
/**
* 交接详情编辑回显
*
* @param sid
* @return
*/
public ResultBean<AppBusDiscountpackageHandoversDto> getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
ResultBean<AppBusDiscountpackageHandoversDto> rb = ResultBean.fireFail();
AppBusDiscountpackageHandoversDto dto = new AppBusDiscountpackageHandoversDto();
AppBusDiscountpackageHandoverDto data = busDiscountpackageHandoverFeign.getDiscountHandoverInfo(sid).getData();
BeanUtils.copyProperties(dto, data);
return rb.success().setData(dto);
}
/**
* 移动端交接操作
*
* @param dto
* @return
* @throws InvocationTargetException
* @throws IllegalAccessException
* @throws ParseException
*/
public ResultBean todoPackageHandover(AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException, ParseException {
ResultBean rb = ResultBean.fireFail();
AppBusDiscountpackageHandoverDto phDto = new AppBusDiscountpackageHandoverDto();
BeanUtils.copyProperties(phDto, dto);
return busDiscountpackageHandoverFeign.todoPackageHandover(phDto);
}
/**
* 移动端图片上传
*
* @param dto
* @return
*/
public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
AppBusDiscountpackageHandoverDto phDto = new AppBusDiscountpackageHandoverDto();
BeanUtils.copyProperties(phDto, dto);
System.out.println(phDto);
return busDiscountpackageHandoverFeign.appUploadPicture(phDto);
}
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -299,7 +299,7 @@ public class InvoicedService {
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
return resultBean;
}

Loading…
Cancel
Save