diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 462a9b911a..95f714772e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -27,13 +27,13 @@ package com.yxt.anrui.buscenter.api.bussalesorder; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.common.core.vo.Vo; @@ -114,6 +114,7 @@ public class BusSalesOrderDetailsVo implements Vo { private String type; @ApiModelProperty(value = "主车车型信息") private BusSalesOrderModelDetailsVo busSalesOrderModel = new BusSalesOrderModelDetailsVo(); +// private AppOrderModelInfoVo modelInfoVo = new AppOrderModelInfoVo(); @ApiModelProperty(value = "价格信息") private BusSalesOrderPriceDetailsVo busSalesOrderPrice = new BusSalesOrderPriceDetailsVo(); @ApiModelProperty(value = "保险说明") @@ -161,4 +162,9 @@ public class BusSalesOrderDetailsVo implements Vo { private String procInstId; @ApiModelProperty("节点状态") private String nodeState; + + @ApiModelProperty("是否是三方金融") + private boolean finPlanState; + + private SolutionsDetailsssVo solutionsDetailsssVo; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java new file mode 100644 index 0000000000..6a671dc9a1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -0,0 +1,154 @@ +package com.yxt.anrui.buscenter.api.bussalesorder; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/31 17:05 + * @Description + */ +@Data +public class SolutionsDetailsssVo { + + + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + + //金融方案主表 + + @ApiModelProperty("类型：01自营非担保，02外部金融") + private String type; + @ApiModelProperty("类型：01自营非担保，02外部金融") + private String typeKey; + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("融资票据") + private String accessoriesAmount; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("车损上浮") + private String vehDamageFloat; + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + private String loanPeriod; + @ApiModelProperty("保证金比例") + private String bondRatio; + @ApiModelProperty("保证金金额") + private String bondAmount; + @ApiModelProperty("厂家贴息") + private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("贷款月还") + private String loanPayMoney; + @ApiModelProperty("贷款利息") + private String loanInterest; + @ApiModelProperty("是否有融资票据") + private boolean accessoriesAmountCb; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("是否有车损上浮") + private boolean vehDamageFloatCb; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + //其他融 + + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + @ApiModelProperty("'融资首付") + private String loanDownPay; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + + //金融方案费用明细 + + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; + @ApiModelProperty("实收合计") + private String realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java index 092d21f178..d5c271eda5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderModelVo.java
@@ -74,9 +77,9 @@ public class BusSalesOrderModelDetailsVo implements Vo { @ApiModelProperty("上装") private String tops; @ApiModelProperty("车架号") - private String vinNo; + private List vinNo = new ArrayList<>(); @ApiModelProperty("采购订单编号") - private String linkNo; + private List linkNo = new ArrayList<>(); @ApiModelProperty("采购数量") private String purNum; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyByOrderSidVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyByOrderSidVo.java new file mode 100644 index 0000000000..2084964bf4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyByOrderSidVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author fanzongzhe + * @description + * @date 2023/3/31 10:45 + */ +@Data +@ApiModel(value = "根据销售订单查询退车列表 视图数据对象", description = "根据销售订单查询退车列表 视图数据对象") +public class BusSalesOrderReturnVehApplyByOrderSidVo implements Vo { + + private String sid; // sid + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; // 申请日期 + @ApiModelProperty("车型图片") + private String filePath ; // 车型图片 + @ApiModelProperty("车型小名") + private String modelName; // 车型小名 + @ApiModelProperty("车架号") + private String vinNo; // 订单台数 + @ApiModelProperty("节点状态") + private String nodeState; // 节点状态 + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java index bc69fe244c..f420355551 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java @@ -68,12 +68,12 @@ public interface BusSalesOrderReturnVehApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -113,4 +113,11 @@ public interface BusSalesOrderReturnVehApplyFeign { @ApiOperation(value = "终止任务") @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody BusSalesOrderReturnVehApplyTaskQuery query); + + + @ApiOperation("根据销售订单sid查询退车列表") + @GetMapping("/listPageByOrderSid/{orderSid}") + @ResponseBody + public ResultBean listPageByOrderSid(@PathVariable("orderSid") String orderSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java index 2eb68a4ceb..fd1bc54095 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java @@ -110,4 +110,8 @@ public class BusSalesOrderReturnVehApplyFeignFallback implements BusSalesOrderRe public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) { return null; } + + @Override + public ResultBean listPageByOrderSid(String orderSid) { return null; } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index c0e1ebc0d8..5c6c8ddd82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -381,7 +381,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid()); + + //查询现车车辆 + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) { + List vinLists = busSalesOrderVehicleService.selectLists(sid); + //包含采购系统的车架号 + List vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); + busSalesOrderModelDetailsVo.setVinNo(vinList); + /* List busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid()); if (busSalesOrderVehicleListVoList.size() != 0) { vo.setBusSalesOrderVehicleList(busSalesOrderVehicleListVoList); + }*/ + } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(entity.getType())) { + List stringLists = busSalesVehicleOrderService.selectLists(sid); + //包含采购系统的采购订单编号 + List stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList()); + busSalesOrderModelDetailsVo.setLinkNo(stringList); + //查询采购订单 +// List busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid()); +// if (busSalesVehicleOrderDetailsVoList.size() != 0) { +// vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList); +// } } - } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(entity.getType())) { - //查询采购订单 - List busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid()); - if (busSalesVehicleOrderDetailsVoList.size() != 0) { - vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList); - } + vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo); } /*************************************************上装信息*****************************************************/ if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(entity.getIsTop())) { @@ -614,6 +623,22 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid); + if(solutionsDetailsVoResultBean.getData() != null){ + SolutionsDetailsssVo solutionsDetailsssVo = new SolutionsDetailsssVo(); + BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(),solutionsDetailsssVo); + vo.setSolutionsDetailsssVo(solutionsDetailsssVo); + } + if("2".equals(entity.getPayTypeKey())){ + vo.setFinPlanState(true); + }else{ + if("1".equals(entity.getFinancePlan())){ + vo.setFinPlanState(false); + }else{ + vo.setFinPlanState(true); + } + } } return rb.success().setData(vo); } @@ -3551,8 +3576,6 @@ public class BusSalesOrderService extends MybatisBaseService fetchByContractNo(String contractId); + + /** + * 根据销售订单返回退车列表 + * @param orderSid + * @return + */ + List listPageByOrderSid(String orderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml index 38f1b5a5fd..f7a723c663 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml @@ -48,9 +48,30 @@ + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java index 358ac4cb0c..ea94a21686 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*; import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -39,12 +40,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign; - /** * Project: anrui_buscenter(销售订单退车)
* File: BusSalesOrderReturnVehApplyFeignFallback.java
@@ -63,79 +58,87 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderRetu @RequestMapping("v1/bussalesorderreturnvehapply") public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehApplyFeign { - @Autowired - private BusSalesOrderReturnVehApplyService busSalesOrderReturnVehApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busSalesOrderReturnVehApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto){ - return busSalesOrderReturnVehApplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private BusSalesOrderReturnVehApplyService busSalesOrderReturnVehApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderReturnVehApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto) { + return busSalesOrderReturnVehApplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return busSalesOrderReturnVehApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return busSalesOrderReturnVehApplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return busSalesOrderReturnVehApplyService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean fetchDetailsByOrderSid(String orderSid) { - return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid); - } - - @Override - public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) { - return busSalesOrderReturnVehApplyService.submitVehicleApply(dto); - } - - @Override - public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId()); - return busSalesOrderReturnVehApplyService.complete(bv); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return busSalesOrderReturnVehApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return busSalesOrderReturnVehApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) { - return busSalesOrderReturnVehApplyService.taskReject(query); - } - - @Override - public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) { - return busSalesOrderReturnVehApplyService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) { - return busSalesOrderReturnVehApplyService.breakProcess(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return busSalesOrderReturnVehApplyService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean fetchDetailsByOrderSid(String orderSid) { + return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid); + } + + @Override + public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) { + return busSalesOrderReturnVehApplyService.submitVehicleApply(dto); + } + + @Override + public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId()); + return busSalesOrderReturnVehApplyService.complete(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return busSalesOrderReturnVehApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return busSalesOrderReturnVehApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) { + return busSalesOrderReturnVehApplyService.taskReject(query); + } + + @Override + public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) { + return busSalesOrderReturnVehApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) { + return busSalesOrderReturnVehApplyService.breakProcess(query); + } + + @Override + public ResultBean listPageByOrderSid(String orderSid) { + + return busSalesOrderReturnVehApplyService.listPageByOrderSid(orderSid); + } + + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 5a69b0ae40..22f879e8ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -39,6 +39,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*; import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; @@ -81,22 +82,13 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApply; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign; -import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -208,9 +200,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService busSalesOrderReturnVehApplies = baseMapper.fetchByContractNo(appOrderDetailsVo.getContractId()); List spVehSids = new ArrayList<>(); - if (busSalesOrderReturnVehApplies.size() > 0){ + if (busSalesOrderReturnVehApplies.size() > 0) { for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) { List busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid()); for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { @@ -285,10 +277,10 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService busSalesOrderReturnVehs = dto.getBusSalesOrderReturnVehs(); List busSalesOrderReturnVehApplies = baseMapper.fetchByContractNo(dto.getContractNo()); List spVehSids = new ArrayList<>(); - if (busSalesOrderReturnVehApplies.size() > 0){ + if (busSalesOrderReturnVehApplies.size() > 0) { for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) { List busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid()); for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { @@ -405,7 +398,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService list = baseMapper.listPageByOrderSid(orderSid); + Map> map = new HashMap<>(); + for (BusSalesOrderReturnVehApplyByOrderSidVo applyByOrderSidVo : list) { + String vinNo = applyByOrderSidVo.getVinNo(); + String sid = applyByOrderSidVo.getSid(); + Set orDefault = map.getOrDefault(sid, new HashSet()); + orDefault.add(vinNo); + map.put(sid, orDefault); + if (StringUtils.isNotBlank(applyByOrderSidVo.getFilePath())) { + String filePath = applyByOrderSidVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + applyByOrderSidVo.setFilePath(filePath); + } + } + List bsvList = new ArrayList<>(); + for (Map.Entry> en : map.entrySet()) { + String key = en.getKey(); + StringBuffer sb = new StringBuffer(); + for (String vinNo : en.getValue()) { + sb.append(vinNo).append("\n"); + } + sb.delete(sb.length() - 1, sb.length()); + BusSalesOrderReturnVehApplyByOrderSidVo bsv = null; + + for (BusSalesOrderReturnVehApplyByOrderSidVo applyByOrderSidVo : list) { + if (applyByOrderSidVo.getSid().equals(key)) { + bsv = applyByOrderSidVo; + break; + } + } + bsv.setVinNo(sb.toString()); + bsvList.add(bsv); + } + return ResultBean.fireSuccess().setData(bsvList); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index e541de4838..2874a2883a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -516,12 +516,12 @@ public class LoanSolutionsService extends MybatisBaseService> list = busSalesOrderReturnVehApplyFeign.listPageByOrderSid(orderSid); + return list; + } } \ No newline at end of file