From 7fa417f725b48e79711a28401f4d21fb5ea0e41d Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 6 Nov 2024 11:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...VehicleBusinessFileManagementDetailVo.java | 39 + .../VehicleBusinessFileManagementFeign.java | 12 +- .../VehicleBusinessFileManagementFileVo.java | 17 + .../VehicleBusinessFileManagementQuery.java | 45 +- .../VehicleBusinessFileManagementVo.java | 8 +- .../BusHandoverItemsMapper.java | 4 + .../BusHandoverItemsService.java | 4 + .../BusValcustFilingMapper.java | 3 + .../BusValcustFilingService.java | 4 + .../VehicleBusinessFileManagementMapper.java | 41 + .../VehicleBusinessFileManagementMapper.xml | 47 ++ .../VehicleBusinessFileManagementRest.java | 57 ++ .../VehicleBusinessFileManagementService.java | 753 ++++++++++++++++++ .../api/finbillfile/FinBillFileAppendxVo.java | 2 + .../fin/api/finbillfile/FinBillFileFeign.java | 22 + .../finbillfile/FinBillFileFeignFallback.java | 25 + .../FinCollectionConfirmationFeign.java | 4 + ...inCollectionConfirmationFeignFallback.java | 5 + .../fin/biz/finbillfile/FinBillFileRest.java | 33 + .../FinCollectionConfirmationMapper.java | 4 +- .../FinCollectionConfirmationMapper.xml | 93 ++- .../FinCollectionConfirmationRest.java | 6 + .../FinCollectionConfirmationService.java | 5 + .../LoanCustomerRecordFeign.java | 4 + .../LoanCustomerRecordFeignFallback.java | 5 + .../api/loanfile/LoanFileFeign.java | 48 ++ .../LoanCustomerRecordMapper.java | 3 + .../LoanCustomerRecordRest.java | 5 + .../LoanCustomerRecordService.java | 6 + .../asbusrepairbill/AsBusrepairBillMapper.xml | 307 +++---- .../AsBusrepairBillService.java | 1 - .../AsServiceAccommApplyService.java | 1 + .../AsTechTitleApplyService.java | 1 + 33 files changed, 1430 insertions(+), 184 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFileVo.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.xml create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementRest.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileFeign.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java index 528418f16c..c8542bb6fe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java @@ -1,4 +1,43 @@ package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data public class VehicleBusinessFileManagementDetailVo { + + @ApiModelProperty("销售订单附件") + private List saleOrderFileList = new ArrayList<>(); + @ApiModelProperty("收款认款附件") + private List collectionPaymentsFileList = new ArrayList<>(); + @ApiModelProperty("开票附件") + private List invoiceFileList = new ArrayList<>(); + @ApiModelProperty("出库附件") + private List outBoundFileList = new ArrayList<>(); + @ApiModelProperty("交车附件") + private List deliveryCarFileList = new ArrayList<>(); + @ApiModelProperty("价值客户备案") + private List valueCustomersFileList = new ArrayList<>(); + @ApiModelProperty("欠款客户备案") + private List arrearsCustomersFileList = new ArrayList<>(); + @ApiModelProperty("欠款开票附件") + private List arrearsInvoiceFileList = new ArrayList<>(); + @ApiModelProperty("欠款领票附件") + private List arrearscollectionFileList = new ArrayList<>(); + @ApiModelProperty("欠款出库附件") + private List arrearsOutBoundFileList = new ArrayList<>(); + @ApiModelProperty("欠款提车附件") + private List arrearsPickupCarFileList = new ArrayList<>(); + @ApiModelProperty("风控资料") + private List riskManagementInfo = new ArrayList<>(); + @ApiModelProperty("贷款前附件") + private List loanBeforeFileList = new ArrayList<>(); + @ApiModelProperty("贷款中附件") + private List loanInFileList = new ArrayList<>(); + @ApiModelProperty("贷款后附件") + private List loanAfterFileList = new ArrayList<>(); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java index a3645710c8..bbb1da2cef 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java @@ -5,8 +5,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "anrui-buscenter-VehicleBusinessFileManagement", @@ -14,8 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody; path = "v1/vehicleBusinessFileManagement") public interface VehicleBusinessFileManagementFeign { - - /*@ApiOperation("车辆业务档案管理列表") + @ApiOperation("车辆业务档案管理列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq);*/ + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("详情编辑回显") + @GetMapping("/getInitBySid/{sid}") + public ResultBean getInitBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFileVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFileVo.java new file mode 100644 index 0000000000..1609bd86b1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFileVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleBusinessFileManagementFileVo { + + @ApiModelProperty("附件名称") + private String fileNmae; + @ApiModelProperty("下载路径") + private String fileUrl; + @ApiModelProperty("上传日期 年-月-日") + private String uploadDate; + @ApiModelProperty("上传人") + private String uploadName; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java index 2ff0218289..c5e80d116b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java @@ -1,4 +1,47 @@ package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; -public class VehicleBusinessFileManagementQuery { +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleBusinessFileManagementQuery implements Query { + + @ApiModelProperty("分公司") + private String orgName; + @ApiModelProperty("销售部门") + private String sellDept; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("销售订单编号") + private String saleOrderNo; + @ApiModelProperty("买卖合同编号") + private String contractNo; + @ApiModelProperty("付款方式") + private String payType; + @ApiModelProperty("业务类型") + private String businessType; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户电话") + private String customerPhone; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("开票单位") + private String invoiceTitle; + @ApiModelProperty("开票类型") + private String invoiceType; + @ApiModelProperty("出库日期") + private String deliveryStartData; + private String deliveryEndData; + @ApiModelProperty("业务状态") + private String businessStatus; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + + private String orgPath; + private String userSid; + private String menuUrl; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java index 6e0be8e612..c7d58ad52c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java @@ -1,14 +1,16 @@ package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data -public class VehicleBusinessFileManagementVo { +public class VehicleBusinessFileManagementVo implements Vo { + private String sid; /** * 车架号 */ @@ -41,6 +43,10 @@ public class VehicleBusinessFileManagementVo { * 客户电话 */ private String customerPhone; + /** + * 客户身份证号 + */ + private String customerIdCard; /** * 销售合同价 */ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java index f2ee315d67..89efec882b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java @@ -7,6 +7,7 @@ import com.yxt.anrui.buscenter.api.bushandoveritems.BusItemVo; import com.yxt.anrui.buscenter.api.bushandoveritems.BusItemsListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -39,6 +40,9 @@ public interface BusHandoverItemsMapper extends BaseMapper { List getTrailerByMainSid(String sid); + @Select("select * from bus_handover_items where vinSid = #{linkSid}") + List getOneByVinSid(String linkSid); + /*IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); BusHandoverItemsVo fetchByHandoverSid(String handoverSid);*/ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java index 9ee67ece0c..cc72e4f7bb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java @@ -94,6 +94,10 @@ public class BusHandoverItemsService extends MybatisBaseService getOneByVinSid(String linkSid) { + return baseMapper.getOneByVinSid(linkSid); + } + /* private QueryWrapper createQueryWrapper(BusHandoverItemsQuery query) { QueryWrapper qw = new QueryWrapper<>(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java index 905c7ef624..d43a2a7567 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java @@ -75,4 +75,7 @@ public interface BusValcustFilingMapper extends BaseMapper { void updateDkBySid(@Param("remarks") String remarks, @Param("dtoSid") String dtoSid); int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid); + + @Select("select * from bus_valcust_filing where vinSid = #{linkSid}}") + BusValcustFiling selectByVinSid(String linkSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 7e501cab39..f10bf43949 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -1111,4 +1111,8 @@ public class BusValcustFilingService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesorder.*; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface VehicleBusinessFileManagementMapper extends BaseMapper { + + IPage archivesPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.xml new file mode 100644 index 0000000000..e4bb0ebcce --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.xml @@ -0,0 +1,47 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementRest.java new file mode 100644 index 0000000000..bc242a0a45 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementRest.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement; + +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementDetailVo; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementFeign; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementQuery; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("v1/vehicleBusinessFileManagement") +public class VehicleBusinessFileManagementRest implements VehicleBusinessFileManagementFeign { + + @Autowired + private VehicleBusinessFileManagementService vehicleBusinessFileManagementService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = vehicleBusinessFileManagementService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean getInitBySid(String sid) { + return vehicleBusinessFileManagementService.getInitBySid(sid); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java new file mode 100644 index 0000000000..5500de3adc --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java @@ -0,0 +1,753 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign; +import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign; +import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; +import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; +import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; +import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; +import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; +import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.api.commoncontract.CommonContract; +import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.CommonContractEnum; +import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; +import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; +import com.yxt.anrui.buscenter.api.busfile.BusFileDto; +import com.yxt.anrui.buscenter.api.bushandover.BusHandover; +import com.yxt.anrui.buscenter.api.bushandover.BusHandoverInitListVo; +import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; +import com.yxt.anrui.buscenter.api.bussalesorder.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.*; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; +import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementDetailVo; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementFileVo; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementQuery; +import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo; +import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService; +import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; +import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; +import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; +import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; +import com.yxt.anrui.buscenter.biz.busfile.BusFileService; +import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService; +import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService; +import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService; +import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; +import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; +import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService; +import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService; +import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService; +import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; +import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService; +import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService; +import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; +import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; +import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService; +import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService; +import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; +import com.yxt.anrui.fin.api.finbillfile.FinAttachTypeEnum; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo; +import com.yxt.anrui.flowable.api.flow.FlowSelectVo; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.FlowableQuery; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; +import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord; +import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecordFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileFeign; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign; +import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; +import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign; +import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmfile.ScmFileFeign; +import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign; +import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelPush; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; +import com.yxt.common.base.config.component.DocPdfComponent; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.Base64; +import com.yxt.common.base.utils.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.messagelist.MessageList; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLEncoder; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import static java.util.Comparator.comparing; + +@Service +public class VehicleBusinessFileManagementService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private CommonContractFeign commonContractFeign; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private CommonAppendixFeign commonAppendixFeign; + @Autowired + private FinCollectionConfirmationFeign finCollectionConfirmationFeign; + @Autowired + private BusSalesOrderVehicleService busSalesOrderVehicleService; + @Autowired + private BusSalesOrderService busSalesOrderService; + @Autowired + private FinBillVehicleFeign finBillVehicleFeign; + @Autowired + private FinBillFileFeign finBillFileFeign; + @Autowired + private FinVehicleInvoiceFeign finVehicleInvoiceFeign; + @Autowired + private BaseVehicleCertificateFeign baseVehicleCertificateFeign; + @Autowired + private BaseVehicleAppendixFeign baseVehicleAppendixFeign; + @Autowired + private ScmFileFeign scmFileFeign; + @Autowired + private LoanFileFeign loanFileFeign; + @Autowired + private BusHandoverItemsService busHandoverItemsService; + @Autowired + private BusHandoverService busHandoverService; + @Autowired + private BuscenterFileService buscenterFileService; + @Autowired + private BuscenterFileService buscenterFile; + @Autowired + private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService; + @Autowired + private BusFileService busFileService; + @Autowired + private BusValcustFilingService busValcustFilingService; + @Autowired + private LoanCustomerRecordFeign loanCustomerRecordFeign; + + public PagerVo listPageVo(PagerQuery pq) { + VehicleBusinessFileManagementQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getOrgName())) { + qw.like("bo.useOrgName", query.getOrgName()); + } + if (StringUtils.isNotBlank(query.getSellDept())) { + qw.like("bo.orgName", query.getSellDept()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getSaleOrderNo())) { + qw.like("bo.billNo", query.getSaleOrderNo()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bo.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getPayType())) { + qw.like("bo.payType", query.getPayType()); + } + if (StringUtils.isNotBlank(query.getBusinessType())) { + //qw.like("ppb.payTypeValue", query.getBusinessType()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("bo.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getCustomerPhone())) { + qw.like("bo.mobile", query.getCustomerPhone()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("bov.linkNo", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bv.modelName", query.getModelName()); + } + if (StringUtils.isNotBlank(query.getInvoiceTitle())) { + qw.like("fa.openTickUnitName", query.getInvoiceTitle()); + } + if (StringUtils.isNotBlank(query.getInvoiceType())) { + qw.like("fa.openTickTypeValue", query.getInvoiceType()); + } + if (StringUtils.isNotBlank(query.getBusinessStatus())) { + //qw.eq("ppbi.isInvoicing", query.getBusinessStatus()); + } + if (StringUtils.isNotBlank(query.getArrearsMoney())) { + qw.gt("SUM(fu.reveivableMoney) - SUM(fs.subscriptionMoney)", query.getArrearsMoney()); + } + String outBoundDateStart = query.getDeliveryStartData(); + String outBoundDateEnd = query.getDeliveryEndData(); + qw.apply(StringUtils.isNotEmpty(outBoundDateStart), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + outBoundDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(outBoundDateEnd), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + outBoundDateEnd + "','%Y-%m-%d')" + ); + qw.groupBy("bov.sid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.archivesPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean getInitBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(sid); + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()); + VehicleBusinessFileManagementDetailVo vo = new VehicleBusinessFileManagementDetailVo(); + List saleOrderFileList = new ArrayList<>();//销售订单附件 + List collectionPaymentsFileList = new ArrayList<>();//收款认款附件 + List invoiceFileList = new ArrayList<>();//开票附件 + List outBoundFileList = new ArrayList<>();//出库附件 + List deliveryCarFileList = new ArrayList<>();//交车附件 + List valueCustomersFileList = new ArrayList<>();//价值客户备案 + List arrearsCustomersFileList = new ArrayList<>();//欠款客户备案 + List arrearsInvoiceFileList = new ArrayList<>();//欠款开票附件 + List arrearscollectionFileList = new ArrayList<>();//欠款领票附件 + List arrearsOutBoundFileList = new ArrayList<>();//欠款出库附件 + List arrearsPickupCarFileList = new ArrayList<>();//欠款提车附件 + List riskManagementInfo = new ArrayList<>();//风控资料 + List loanBeforeFileList = new ArrayList<>();//贷款前附件 + List loanInFileList = new ArrayList<>();//贷款中附件 + List loanAfterFileList = new ArrayList<>();//贷款后附件 + CommonContractBuscenterVo data = commonContractFeign.selectByBusSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + CommonContract commonContract = commonContractFeign.getContractByBusSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + if (data.getContractType().contains("新车买卖合同")) { + List pcCommonAppendixDtoList = data.getPcCommonAppendixDtoList(); + for (CommonAppendixVo commonAppendixVo : pcCommonAppendixDtoList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("新车买卖合同"); + vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName()); + saleOrderFileList.add(vehicleBusinessFileManagementFileVo); + } + } + if (data.getContractType().contains("车辆登记合同")) { + List pcCommonAppendixDtoList = data.getPcCommonAppendixDtoList(); + for (CommonAppendixVo commonAppendixVo : pcCommonAppendixDtoList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同"); + vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName()); + saleOrderFileList.add(vehicleBusinessFileManagementFileVo); + } + } + if (StringUtils.isNotBlank(commonContract.getSceneSignUrl())) { + String[] sceneSignUrls = commonContract.getSceneSignUrl().split(","); + for (String signUrl : sceneSignUrls) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + signUrl); + vehicleBusinessFileManagementFileVo.setFileNmae("合同现场签署照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(DateUtil.formatDate(commonContract.getCreateTime())); + vehicleBusinessFileManagementFileVo.setUploadName(commonContract.getStaffName()); + saleOrderFileList.add(vehicleBusinessFileManagementFileVo); + } + } + List collSids = finCollectionConfirmationFeign.selectSids(sid).getData(); + for (String collSid : collSids) { + CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(collSid); + commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + ResultBean> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("打款凭证"); + vehicleBusinessFileManagementFileVo.setUploadDate(commonApp.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(commonApp.getName()); + collectionPaymentsFileList.add(vehicleBusinessFileManagementFileVo); + } + } + } + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(busSalesOrderVehicle.getLinkSid()).getData(); + List kxqqs = finBillFileFeign.fetchFileBySid(finBillVehicleDetailsVo.getBillAppSid(), FinAttachTypeEnum.KPXXQRS.getAttachType()).getData(); + for (FinBillFileAppendxVo kxqq : kxqqs) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(kxqq.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("款项确认书"); + vehicleBusinessFileManagementFileVo.setUploadDate(kxqq.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(kxqq.getName()); + collectionPaymentsFileList.add(vehicleBusinessFileManagementFileVo); + } + List zjApplicationAppendxs = finBillFileFeign.fetchzjBySid(sid).getData(); + for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + zjApplicationAppendx.getFileUrl()); + vehicleBusinessFileManagementFileVo.setFileNmae("营业执照或身份证"); + vehicleBusinessFileManagementFileVo.setUploadDate(zjApplicationAppendx.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(zjApplicationAppendx.getCreateByName()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + List clmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(sid).getData(); + for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + clmmhtApplicationAppendx.getFileUrl()); + vehicleBusinessFileManagementFileVo.setFileNmae("新车买卖合同-部分空白"); + vehicleBusinessFileManagementFileVo.setUploadDate(clmmhtApplicationAppendx.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(clmmhtApplicationAppendx.getCreateByName()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + List cldjhtApplicationAppendxs = finBillFileFeign.fetchcldjhtBySid(sid).getData(); + for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + cldjhtApplicationAppendx.getFileUrl()); + vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同"); + vehicleBusinessFileManagementFileVo.setUploadDate(cldjhtApplicationAppendx.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(cldjhtApplicationAppendx.getCreateByName()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + List khkpsqsApplicationAppendxs = finBillFileFeign.fetchkhkpsqsBySid(sid).getData(); + for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + khkpsqsApplicationAppendx.getFileUrl()); + vehicleBusinessFileManagementFileVo.setFileNmae("开票申请书"); + vehicleBusinessFileManagementFileVo.setUploadDate(khkpsqsApplicationAppendx.getCreateTime()); + vehicleBusinessFileManagementFileVo.setUploadName(khkpsqsApplicationAppendx.getCreateByName()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + VehicleInvoiceVo vehicleInvoiceVo = finVehicleInvoiceFeign.selectByVinSid(busSalesOrderVehicle.getLinkSid()).getData(); + for (String string : vehicleInvoiceVo.getInvoiceImages()) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + string); + vehicleBusinessFileManagementFileVo.setFileNmae("发票照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(vehicleInvoiceVo.getInvoiceDate()); + vehicleBusinessFileManagementFileVo.setUploadName(vehicleInvoiceVo.getDrawer()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + BaseVehicleCertificateVo certificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData(); + if (null != certificateVo) { + String certificateVoSid = certificateVo.getSid(); + List vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(certificateVoSid).getData(); + for (String s : vehicleAppendixList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(s); + vehicleBusinessFileManagementFileVo.setFileNmae("合格证照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(certificateVo.getReceiveDate()); + vehicleBusinessFileManagementFileVo.setUploadName(certificateVo.getReceiver()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + } + List scmFiles = scmFileFeign.selectByLinkSid(sid, DictCommonEnum.ScmFileType.BD_IMAGE.getCode()).getData(); + for (ScmFile scmFile : scmFiles) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("保单照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(scmFile.getCreateTime().toString()); + vehicleBusinessFileManagementFileVo.setUploadName(scmFile.getName()); + invoiceFileList.add(vehicleBusinessFileManagementFileVo); + } + List oneByVinSid = busHandoverItemsService.getOneByVinSid(busSalesOrderVehicle.getLinkSid()); + BusHandover busHandover = busHandoverService.fetchBySid(oneByVinSid.get(0).getHandoverSid()); + for (BusHandoverItems v : oneByVinSid) { + String handoverPhoto = v.getHandoverPhoto(); + if (StringUtils.isNotBlank(handoverPhoto)) { + List stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (String s : stringList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(s); + vehicleBusinessFileManagementFileVo.setFileNmae("车辆交车照片（含挂车）"); + vehicleBusinessFileManagementFileVo.setUploadDate(v.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + } + } + BusHandoverItems busHandoverItems = oneByVinSid.get(0); + List fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.RECEIVE_CAR_IMAGES.getAttachType()); + for (BuscenterFile buscenterFile : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("接收车辆确认书照片（含挂车）"); + vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.ENTRUST_IDCARD_IMAGES.getAttachType()); + for (BuscenterFile buscenterFile : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("委托提车授权书、委托人身份证照片（含挂车）"); + vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + for (BusHandoverItems v : oneByVinSid) { + String handoverPhoto = v.getHandoverPhoto(); + if (StringUtils.isNotBlank(handoverPhoto)) { + List stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (String s : stringList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(s); + vehicleBusinessFileManagementFileVo.setFileNmae("交车照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(v.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + } + } + fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType()); + for (BuscenterFile buscenterFile : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("交车资料确认单照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.EXIT_TICKET_IMAGES.getAttachType()); + for (BuscenterFile buscenterFile : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("出门证照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + List buscenterFiles = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + for (BuscenterFile buscenterFile : buscenterFiles) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("优惠包交接资料照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(busSalesOrderVehicle.getLinkSid()); + List otherFiles = buscenterFile.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + for (BuscenterFile otherFile : otherFiles) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + otherFile.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("其他资料照片"); + vehicleBusinessFileManagementFileVo.setUploadDate(otherFile.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + deliveryCarFileList.add(vehicleBusinessFileManagementFileVo); + } + BusValcustFiling busValcustFiling = busValcustFilingService.selectByVinSid(busSalesOrderVehicle.getLinkSid()); + List busFileDtos = busFileService.getPathByLinkSid(busValcustFiling.getSid()); + for (BusFileDto busFileDto : busFileDtos) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("相关附件"); + vehicleBusinessFileManagementFileVo.setUploadDate(busFileDto.getCreateTime().toString()); + vehicleBusinessFileManagementFileVo.setUploadName(busFileDto.getName()); + valueCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + LoanCustomerRecord loanCustomerRecord = loanCustomerRecordFeign.selectByCustSid(busSalesOrder.getCustomerSid()).getData(); + fileList = loanFileFeign.selectByLinkSid(loanCustomerRecord.getSid(), LoanFileEnum.LICENSE.getAttachType()).getData(); + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("营业执照（企业或个人挂靠运输公司时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.ID_CARD.getAttachType()).getData(); + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("法人和实际控制人身份证（企业时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("本人身份证（个人时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.INFO_LETTER.getAttachType()).getData(); + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("法人和实际控制人签署的《信息查询授权书》（企业时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("本人签署的《信息查询授权书》（个人时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.AGREEMENT.getAttachType()).getData(); + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("车队挂靠协议（个人挂靠运输公司时显示）"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.OTHER_INFO.getAttachType()).getData(); + for (BuscenterFile file : fileList) { + VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo(); + vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + vehicleBusinessFileManagementFileVo.setFileNmae("其他资料"); + vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData(); + vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName()); + arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo); + } + /*List fjApplicationAppendxs = finBillFileFeign.fetchfjBySid(sid); + for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) { + String fileUrl = fjApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + fjApplicationAppendx.setFileUrl(fileUrl); + }*/ + vo.setSaleOrderFileList(saleOrderFileList); + vo.setCollectionPaymentsFileList(collectionPaymentsFileList); + vo.setInvoiceFileList(invoiceFileList); + vo.setDeliveryCarFileList(deliveryCarFileList); + vo.setValueCustomersFileList(valueCustomersFileList); + vo.setArrearsCustomersFileList(valueCustomersFileList); + return rb.success().setData(vo); + } +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java index ca1f9f5b33..4ccb371b97 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java @@ -51,4 +51,6 @@ public class FinBillFileAppendxVo implements Vo { private String filePath; @ApiModelProperty("附件名称") private String appendixName; + @ApiModelProperty("上传时间") + private String createTime; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java index f937630b47..f28383c74f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java @@ -81,6 +81,28 @@ public interface FinBillFileFeign { @ResponseBody public ResultBean> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType); + @ApiOperation("查询证件附件") + @PostMapping("/fetchzjBySid") + @ResponseBody + ResultBean> fetchzjBySid(@RequestParam("sid") String sid); + + @ApiOperation("查询新车买卖合同附件") + @PostMapping("/fetchclmmhtBySid") + @ResponseBody + ResultBean> fetchclmmhtBySid(@RequestParam("sid") String sid); + @ApiOperation("查询车辆登记合同附件") + @PostMapping("/fetchcldjhtBySid") + @ResponseBody + ResultBean> fetchcldjhtBySid(@RequestParam("sid") String sid); + @ApiOperation("查询开票申请书附件") + @PostMapping("/fetchkhkpsqsBySid") + @ResponseBody + ResultBean> fetchkhkpsqsBySid(@RequestParam("sid") String sid); + + @ApiOperation("查询") + @PostMapping("/fetchfjBySid") + @ResponseBody + ResultBean> fetchfjBySid(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java index 231359a9e2..3bdf914c51 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java @@ -74,4 +74,29 @@ public class FinBillFileFeignFallback implements FinBillFileFeign { public ResultBean> fetchFileBySid(String billAppSid, String fileType) { return null; } + + @Override + public ResultBean> fetchzjBySid(String sid) { + return null; + } + + @Override + public ResultBean> fetchclmmhtBySid(String sid) { + return null; + } + + @Override + public ResultBean> fetchcldjhtBySid(String sid) { + return null; + } + + @Override + public ResultBean> fetchkhkpsqsBySid(String sid) { + return null; + } + + @Override + public ResultBean> fetchfjBySid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 9fbf8956bb..7d40ef936e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -110,6 +110,10 @@ public interface FinCollectionConfirmationFeign { @ResponseBody ResultBean ctskd(@RequestParam("skdSid") String skdSid); + @ApiOperation("根据销售订单车辆sid查询收款sid") + @PostMapping("/selectSids") + ResultBean> selectSids(@RequestParam("busVehSid") String busVehSid); + /*----------------------金融认款申请---------------------------*/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 173bf36aa0..a365921bde 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -109,6 +109,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf return null; } + @Override + public ResultBean> selectSids(String busVehSid) { + return null; + } + @Override public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java index 5959c62422..8960fee6fa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java @@ -93,6 +93,39 @@ public class FinBillFileRest implements FinBillFileFeign { return rb.success().setData(vo); } + @Override + public ResultBean> fetchzjBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List finBillFileVos = finBillFileService.fetchzjBySid(sid); + return rb.success().setData(finBillFileVos); + } + + @Override + public ResultBean> fetchclmmhtBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List finBillFileVos = finBillFileService.fetchclmmhtBySid(sid); + return rb.success().setData(finBillFileVos); + } + + @Override + public ResultBean> fetchcldjhtBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List finBillFileVos = finBillFileService.fetchcldjhtBySid(sid); + return rb.success().setData(finBillFileVos); + } + + @Override + public ResultBean> fetchkhkpsqsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List finBillFileVos = finBillFileService.fetchkhkpsqsBySid(sid); + return rb.success().setData(finBillFileVos); + } + + @Override + public ResultBean> fetchfjBySid(String sid) { + return null; + } + @Override public ResultBean> fetchFileBySid(String billAppSid, String fileType) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 1ded817047..6c03379aef 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -172,7 +172,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper selectBys(String busVinSid); @@ -189,4 +189,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper selectSids(String busVehSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 952d855989..176e3283c5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -83,34 +83,33 @@ - select * from anrui_riskcenter.loan_repayment_plan_details where sid = #{busSid} + select * + from anrui_riskcenter.loan_repayment_plan_details + where sid = #{busSid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index cc0ec2a1ba..5282de3f9b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -131,6 +131,12 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean ctskd(String skdSid) { return finCollectionConfirmationService.ctskd(skdSid); } + + @Override + public ResultBean> selectSids(String busVehSid) { + return finCollectionConfirmationService.selectSids(busVehSid); + } + //------------------------金融认款申请----------------------------------- @Override public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 749d576b18..0fb4d038e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -5566,4 +5566,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService> selectSids(String busVehSid) { + ResultBean rb = ResultBean.fireFail(); + List sids = baseMapper.selectSids(busVehSid); + return rb.success().setData(sids); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java index 47b2252552..6a7f055f79 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java @@ -156,4 +156,8 @@ public interface LoanCustomerRecordFeign { @ResponseBody ResultBean> selectAffiliated(@RequestParam("orgPath") String orgPath, @RequestParam(value = "name", required = false) String name); + @ApiOperation("根据客户sid查询") + @GetMapping("/selectByCustSid") + @ResponseBody + ResultBean selectByCustSid(@RequestParam("customerSid") String customerSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java index 295dbf71a6..8e8ec2eec8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java @@ -115,4 +115,9 @@ public class LoanCustomerRecordFeignFallback implements LoanCustomerRecordFeign public ResultBean> selectAffiliated(String orgPath, String name) { return null; } + + @Override + public ResultBean selectByCustSid(String customerSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileFeign.java new file mode 100644 index 0000000000..894877c7cc --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileFeign.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfile; + +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@FeignClient( + contextId = "riskcenter-LoanFile", + name = "riskcenter", + path = "v1/loanfile") +public interface LoanFileFeign { + + @ApiOperation("查询附件") + @PostMapping("/selectByLinkSid") + @ResponseBody + ResultBean> selectByLinkSid(@RequestParam("sid") String sid, @RequestParam("attachType") String attachType); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordMapper.java index 5ddc419217..d3bb93655a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordMapper.java @@ -34,4 +34,7 @@ public interface LoanCustomerRecordMapper extends BaseMapper int updateFlowFiled(Map map); IPage getCustomerRecordList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("select * from loan_customer_record where customerSid = #{customerSid}}") + LoanCustomerRecord selectByCustSid(String customerSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java index 1c42334fac..f3275d0470 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java @@ -154,4 +154,9 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign { public ResultBean> selectAffiliated(String orgPath, String name) { return loanCustomerRecordService.selectAffiliated(orgPath, name); } + + @Override + public ResultBean selectByCustSid(String customerSid) { + return loanCustomerRecordService.selectByCustSid(customerSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index 9d36639b88..80c7d20fc8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -1791,4 +1791,10 @@ public class LoanCustomerRecordService extends MybatisBaseService selectByCustSid(String customerSid) { + ResultBean rb = ResultBean.fireFail(); + LoanCustomerRecord loanCustomerRecord = baseMapper.selectByCustSid(customerSid); + return rb.success().setData(loanCustomerRecord); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index e58e459c79..92fc1e55d8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -28,32 +28,32 @@ @@ -127,27 +152,27 @@ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 01fd0bc38a..2d0ee638f8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -1395,7 +1395,6 @@ public class AsBusrepairBillService extends MybatisBaseService= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); - qw.and(wrapper -> wrapper.eq("a.nodeCode", 3).or().eq("a.nodeCode", 5)); IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.pageBillList(page, qw); for (AsBusrepairPageVo record : pagging.getRecords()) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java index 85177580ea..d3cac463a0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java @@ -177,6 +177,7 @@ public class AsServiceAccommApplyService extends MybatisBaseService= date_format('" + finishTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (aaa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" ); + qw.orderByDesc("aaa.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java index 9e6842df46..3d3aa11d6a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java @@ -185,6 +185,7 @@ public class AsTechTitleApplyService extends MybatisBaseService= date_format('" + finishStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishEndTime), "date_format (tta.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("tta.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);