From ecfd9f71e17471069dc9de7c58816da8f91f8795 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Apr 2023 11:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 ++ .../commoncontract/CommonContractFeign.java | 6 +++ .../api/commoncontract/ContractPageQuery.java | 20 ++++++++ .../api/commoncontract/ContractPageVo.java | 24 +++++++++ .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 18 +++++++ .../base/biz/basevehicle/BaseVehicleRest.java | 5 ++ .../biz/basevehicle/BaseVehicleService.java | 35 +++++++++++++ .../commoncontract/CommonContractMapper.java | 2 + .../commoncontract/CommonContractMapper.xml | 17 +++++++ .../commoncontract/CommonContractRest.java | 14 +++++ .../commoncontract/CommonContractService.java | 28 ++++++++++ .../autoservice/approval/AppRovalFeign.java | 4 +- .../approval/AppVehicleQKKPQuery.java | 2 - .../approval/AppVehicleQKKPVo.java | 18 ++----- .../api/autoservice/invoiced/VinListVo.java | 2 + .../autoservice/approval/AppRovalRest.java | 7 ++- .../autoservice/approval/AppRovalService.java | 51 ++++++++++++++++--- 18 files changed, 233 insertions(+), 26 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index dacaf922e0..a385700f03 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -297,6 +297,10 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleQKKPList") ResultBean> vehicleQKKPList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("移动端-欠款开票选择车辆分页列表") + @PostMapping("/appVehicleQKKPList") + ResultBean> appVehicleQKKPList(@RequestBody BaseVehicleQKKPQuery query); + @ApiOperation("采购退库更新状态") @PostMapping("/updateByVinNo") ResultBean updateByVinNo(@RequestBody BaseVehicleUpdateQuery baseVehicleUpdateQuery); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 76b3353d89..705bbc29a9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -239,4 +239,10 @@ public interface CommonContractFeign { @PostMapping("/selectByStaffSid") @ResponseBody ResultBean> selectByStaffSid(@RequestBody PagerQuery query); + + @ApiOperation("移动端-查询业务员名下的合同信息") + @PostMapping("/getApprovalContractList") + @ResponseBody + ResultBean> getApprovalContractList(@RequestBody PagerQuery query); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java new file mode 100644 index 0000000000..5eec77cf01 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ContractPageQuery implements Query { + + private static final long serialVersionUID = -1449862667407636197L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("车架号 客户名称 合同编号") + private String name; + @ApiModelProperty("状态") + private int stateType; + @ApiModelProperty("组织全路径") + private String orgPath; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageVo.java new file mode 100644 index 0000000000..76df46b89c --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ContractPageVo implements Vo { + + private static final long serialVersionUID = 907545793790278229L; + + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("销售订单sid") + private String busSid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("合同审核日期") + private String createDate; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 825ed872e8..299526a686 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -501,4 +501,6 @@ public interface BaseVehicleMapper extends BaseMapper { List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); IPage vehicleQKKPPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 198978dd32..579a65f13c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1721,4 +1721,22 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 9528d55fa1..31ecc17e66 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -1110,6 +1110,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> appVehicleQKKPList(BaseVehicleQKKPQuery query) { + return baseVehicleService.appVehicleQKKPList(query); + } + @Override public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) { return baseVehicleService.updateByVinNo(baseVehicleUpdateQuery); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index fdc13221fd..859ae42173 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3883,4 +3883,39 @@ public class BaseVehicleService extends MybatisBaseService> appVehicleQKKPList(BaseVehicleQKKPQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bso.contractNo",query.getContractNo()); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("bsov.linkNo", query.getVinNo()); + } + if (query.getVinSids().size() > 0) { + qw.notIn("bsov.linkSid", query.getVinSids()); + } + List baseVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw); + List baseVehicleQKKPVosNew = new ArrayList<>(); + List baseVehicleQKKPTrailerVos = new ArrayList<>(); + for (BaseVehicleQKKPVo record : baseVehicleQKKPVos) { + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); + if (finBillVehicleDetailsVo == null){ + baseVehicleQKKPVosNew.add(record); + } + } + for (BaseVehicleQKKPVo baseVehicleQKKPVo : baseVehicleQKKPVosNew) { + TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(),baseVehicleQKKPVo.getContractNo()).getData(); + List trailerVos = data.getList(); + if (trailerVos != null && trailerVos.size() > 0){ + for (TrailerVo trailerVo : trailerVos) { + BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo(); + baseVehicleQKKPTrailerVo.setVinNo(baseVehicleQKKPVo.getVinNo()); + baseVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); + baseVehicleQKKPTrailerVos.add(baseVehicleQKKPTrailerVo); + } + } + baseVehicleQKKPVo.setTrailers(baseVehicleQKKPTrailerVos); + } + return rb.success().setData(baseVehicleQKKPVos); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index 1a422396ef..8e1d2c8913 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -97,4 +97,6 @@ public interface CommonContractMapper extends BaseMapper { int getToDoNum(@Param("userSid") String userSid); IPage selectByStaffSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage getApprovalContractList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 11f07f96a3..cfab711ca7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -220,4 +220,21 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 6f053964f5..3237697c2c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -1,14 +1,17 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.flowable.*; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -618,4 +621,15 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean> selectByStaffSid(PagerQuery query) { return commonContractService.selectByStaffSid(query); } + + @Override + public ResultBean> getApprovalContractList(PagerQuery query) { + if (StringUtils.isBlank(query.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = commonContractService.getApprovalContractList(query); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 812fcfab2e..b409e1cab5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -30,6 +30,8 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; @@ -2638,4 +2640,30 @@ public class CommonContractService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + + public IPage getApprovalContractList(PagerQuery query) { + ContractPageQuery params = query.getParams(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); + String orgPath = params.getOrgPath(); + String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1); + if (params.getStateType() == 2){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("staffSid",sysUserVo.getStaffSid()); + qw.eq("orgSid",deptSid); + if (StringUtils.isNotBlank(params.getName())){ + qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); + } + qw.orderByDesc("createDate"); + IPage page = PagerUtil.queryToPage(query); + IPage iPage = baseMapper.getApprovalContractList(page, qw); + for (ContractPageVo record : iPage.getRecords()) { + String createDate = record.getCreateDate(); + DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); + createDate = DateUtil.formatDate(dateTime); + record.setCreateDate(createDate); + } + return iPage; + } + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java index 9e352cbb0f..dd2d5b274d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: anrui-base(安瑞基础)
* File: CommonContractFeign.java
@@ -37,6 +39,6 @@ public interface AppRovalFeign { @ApiOperation("移动端-欠款开票选择车辆列表") @PostMapping("/getVehicleQKKPList") @ResponseBody - public ResultBean> getVehicleQKKPList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getVehicleQKKPList(@RequestBody AppVehicleQKKPQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java index bb7d52e231..bd21356bdd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java @@ -18,6 +18,4 @@ public class AppVehicleQKKPQuery implements Query { private String contractNo; @ApiModelProperty(value = "车辆sid") private List vinSids; - @ApiModelProperty("车架号") - private String vinNo; // 车架号 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java index a70c3e874d..5f3850d110 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.approval; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerVo; +import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,18 +16,8 @@ import java.util.List; @Data public class AppVehicleQKKPVo implements Vo { - @ApiModelProperty(value = "合同编号") - private String contractNo; - @ApiModelProperty("客户名称") - private String customerName; // 客户名称 - @ApiModelProperty("车架号") - private String vinNo; // 车架号 - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("合格证状态key") - private String certificateState; // 合格证状态key - @ApiModelProperty("合格证状态value") - private String certificateStateValue; // 合格证状态value + @ApiModelProperty(value = "主车信息") + private VinListVo vinDto; @ApiModelProperty(value = "挂车信息") - private List trailers; + private List gcList; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index 4ae9e454b6..72b4a83371 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -12,6 +12,8 @@ public class VinListVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; @ApiModelProperty("开票类型") private String invoiceTypeKey; @ApiModelProperty("开票类型") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java index 25f7e48735..6ae4d9b4ff 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java @@ -34,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * Project: anrui_buscenter(销售业务)
* File: BusAdvanceGinvoiceapplyFeignFallback.java
@@ -62,7 +64,8 @@ public class AppRovalRest implements AppRovalFeign { } @Override - public ResultBean> getVehicleQKKPList(PagerQuery pagerQuery) { - return appRovalService.getVehicleQKKPList(pagerQuery); + public ResultBean> getVehicleQKKPList(AppVehicleQKKPQuery query) { + return appRovalService.getVehicleQKKPList(query); } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java index a4995e66c6..f9e0f38551 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java @@ -30,14 +30,21 @@ package com.yxt.anrui.terminal.biz.autoservice.approval; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPQuery; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContractQKQuery; +import com.yxt.anrui.base.api.commoncontract.ContractPageQuery; +import com.yxt.anrui.base.api.commoncontract.ContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerVo; import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPQuery; import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPVo; import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery; import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo; +import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -45,6 +52,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui_buscenter(销售业务)
@@ -65,21 +75,46 @@ public class AppRovalService { @Autowired BusSalesOrderFeign busSalesOrderFeign; @Autowired + CommonContractFeign commonContractFeign; + @Autowired BaseVehicleFeign baseVehicleFeign; public ResultBean> getApprovalContractList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> approvalContractList = busSalesOrderFeign.getApprovalContractList(pq); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> approvalContractList = commonContractFeign.getApprovalContractList(pq); PagerVo vo = CoverUtils.selectPagerVo(approvalContractList.getData()); return rb.success().setData(vo); } - public ResultBean> getVehicleQKKPList(PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> pagerVoResultBean = baseVehicleFeign.vehicleQKKPList(pq); - PagerVo vo = CoverUtils.selectPagerVo(pagerVoResultBean.getData()); - return rb.success().setData(vo); + public ResultBean> getVehicleQKKPList(AppVehicleQKKPQuery query) { + ResultBean rb = ResultBean.fireFail(); + List appVehicleQKKPVos = new ArrayList<>(); + BaseVehicleQKKPQuery baseVehicleQKKPQuery = new BaseVehicleQKKPQuery(); + baseVehicleQKKPQuery.setContractNo(query.getContractNo()); + baseVehicleQKKPQuery.setVinSids(query.getVinSids()); + List baseVehicleQKKPVos = baseVehicleFeign.appVehicleQKKPList(baseVehicleQKKPQuery).getData(); + for (BaseVehicleQKKPVo baseVehicleQKKPVo : baseVehicleQKKPVos) { + AppVehicleQKKPVo appVehicleQKKPVo = new AppVehicleQKKPVo(); + VinListVo vinListVo = new VinListVo(); + vinListVo.setVin(baseVehicleQKKPVo.getVinNo()); + vinListVo.setVinSid(baseVehicleQKKPVo.getVehSid()); + vinListVo.setCertificateStateKey(baseVehicleQKKPVo.getCertificateState()); + vinListVo.setCertificateState(baseVehicleQKKPVo.getCertificateStateValue()); + List trailers = baseVehicleQKKPVo.getTrailers(); + ArrayList finBillTrailerVos = new ArrayList<>(); + if (trailers != null){ + for (BaseVehicleQKKPTrailerVo trailer : trailers) { + FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); + finBillTrailerVo.setVinNo(trailer.getVinNo()); + finBillTrailerVo.setGcVinNo(trailer.getGcVinNo()); + finBillTrailerVos.add(finBillTrailerVo); + } + } + appVehicleQKKPVo.setVinDto(vinListVo); + appVehicleQKKPVo.setGcList(finBillTrailerVos); + appVehicleQKKPVos.add(appVehicleQKKPVo); + } + return rb.success().setData(appVehicleQKKPVos); } } \ No newline at end of file