From 9da3a757d65ccd7ff661f8436ef74eb4e12e2e97 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Sat, 23 Jul 2022 17:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 8 + .../basevehicle/BaseVehicleFeignFallback.java | 10 + .../api/basevehicle/VinByWarehouseQuery.java | 22 +++ .../anrui/base/common/enums/BillTypeEnum.java | 1 + .../biz/basevehicle/BaseVehicleMapper.java | 8 +- .../biz/basevehicle/BaseVehicleMapper.xml | 15 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 18 ++ .../biz/basevehicle/BaseVehicleService.java | 33 +++- .../busdelivered/AppBusDeliveredPageVo.java | 21 +- .../BusDeliveredApplyFeign.java | 4 +- .../BusDeliveredApplyFeignFallback.java | 2 +- .../biz/busdelivered/BusDeliveredMapper.java | 2 +- .../biz/busdelivered/BusDeliveredService.java | 2 +- .../BusDeliveredApplyMapper.java | 2 +- .../BusDeliveredApplyRest.java | 4 +- .../BusDeliveredApplyService.java | 2 +- .../ScmVehicleGressionFeign.java | 4 + .../ScmVehicleGressionFeignFallback.java | 5 + .../TemporaryExitPermitInfo.java | 36 ++++ .../ScmVehicleGressionMapper.java | 2 + .../ScmVehicleGressionMapper.xml | 6 + .../ScmVehicleGressionRest.java | 5 + .../ScmVehicleGressionService.java | 187 +++++++++++------- .../retrieval/AppBusDeliveredApplyFeign.java | 6 +- .../AppBusDeliveredApplyFeignFallback.java | 4 +- .../retrieval/DeliveredPageVo.java | 15 +- .../retrieval/AppBusDeliveredApplyRest.java | 18 +- .../AppBusDeliveredApplyService.java | 65 +++++- 28 files changed, 407 insertions(+), 100 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.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 c2cdbc02e1..eba34ec4f8 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 @@ -253,6 +253,10 @@ public interface BaseVehicleFeign { @PostMapping("/updateVehicleGressionByVin") ResultBean updateVehicleGressionByVin(@RequestBody VehicleGression vehicleGression); + @ApiOperation("根据车架号获取车辆sid") + @GetMapping("/selVehicleByVinNo/{vinNo}") + ResultBean selVehicleByVinNo(@PathVariable("vinNo") String vinNo); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") @@ -309,6 +313,10 @@ public interface BaseVehicleFeign { @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}") public ResultBean> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid); + @ApiOperation("Pc根据仓库sid 获取车架号") + @PostMapping("/getPcVinByWarehouseSid") + public ResultBean> getPcVinByWarehouseSid(@RequestBody PagerQuery pagerQuery); + @ApiOperation("根据用户sid 获取库存车辆信息") @GetMapping("/selectInventoryRecords/{userSid}") public ResultBean> selectInventoryRecords(@PathVariable("userSid") String userSid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index f67ddc2d7b..9aa19ca24a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -171,6 +171,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selVehicleByVinNo(String vinNo) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; @@ -231,6 +236,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> getPcVinByWarehouseSid(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> selectInventoryRecords(String userSid) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java new file mode 100644 index 0000000000..0f7dbd954f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VinByWarehouseQuery implements Query { + private static final long serialVersionUID = -4205300860994909841L; + + @ApiModelProperty("仓库sid") + private String warehouseSid; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("分公司sid") + private String useOrgSid; + + @ApiModelProperty("车架号") + private String vin; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 554a22875a..b9d10a1d0a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -16,6 +16,7 @@ public enum BillTypeEnum { CJTKSQ("CJTKSQ", "厂家退库申请"), FYSQ("FYSQ","费用申请"), FKSQ("FKSQ","付款申请"), + KCDDBGSQ("KCDDBGSQ","库存地点变更申请") ; private String billType; 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 00c4d52307..c7d4737f02 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 @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo; import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -409,5 +411,9 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehiclePurchasePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - Map checkVinNo(@Param("vinNo") String vinNo,@Param("modelSid") String modelSid,@Param("configSid") String configSid,@Param("sellerOrgSid") String sellerOrgSid); + BaseVehicleVo selVehicleByVinNo(@Param("vinNo") String vinNo); + + Map checkVinNo(@Param("vinNo") String vinNo, @Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("sellerOrgSid") String sellerOrgSid); + + IPage getPcVinByWarehouseSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("warehouseSid") String warehouseSid); } \ 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 211c46ff41..c8d203a56d 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 @@ -891,4 +891,19 @@ AND modelConfigSid = #{configSid} AND createOrgSid = #{sellerOrgSid} + + + + \ 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 51e5f8d241..6e54d4b400 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 @@ -13,6 +13,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -407,6 +408,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.updateVehicleGressionByVin(vehicleGression); } + @Override + public ResultBean selVehicleByVinNo(String vinNo) { + return baseVehicleService.selVehicleByVinNo(vinNo); + } + /** * 手机端现车列表 * @@ -641,6 +647,18 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid); } + @Override + public ResultBean> getPcVinByWarehouseSid(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + return rb.setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + @Override public ResultBean> selectInventoryRecords(String userSid) { return baseVehicleService.selectInventoryRecords(userSid); 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 e286f7eae2..cd628deed0 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 @@ -21,6 +21,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; @@ -820,8 +821,8 @@ public class BaseVehicleService extends MybatisBaseService wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); - qw.eq("bv.settlementStatus",VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); + qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); } return qw; } @@ -1570,7 +1571,29 @@ public class BaseVehicleService extends MybatisBaseService checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) { - return baseMapper.checkVinNo(vinNo,modelSid,configSid,sellerOrgSid); + public Map checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) { + return baseMapper.checkVinNo(vinNo, modelSid, configSid, sellerOrgSid); + } + + public ResultBean selVehicleByVinNo(String vinNo) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleVo vo = baseMapper.selVehicleByVinNo(vinNo); + return rb.success().setData(vo); + } + + public IPage getPcVinByWarehouseSid(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = new QueryWrapper(); + VinByWarehouseQuery params = pagerQuery.getParams(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + params.setUseOrgSid(useOrgSid); + if (StringUtils.isNotBlank(params.getVin())) { + qw.like("bv.vinNo", params.getVin()); + } + if (StringUtils.isNotBlank(params.getUseOrgSid())) { + qw.eq("bv.createOrgSid", params.getUseOrgSid()); + } + IPage iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid()); + return iPage; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java index cc944c26c7..a0fa6737ff 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.busdelivered; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,13 +11,31 @@ import java.util.List; public class AppBusDeliveredPageVo implements Vo { private static final long serialVersionUID = 2366744572396819068L; + @ApiModelProperty("列表sid") + private String sid; + @ApiModelProperty("合同编号") + @JsonProperty("contractId") private String contractNo; @ApiModelProperty("类型 1 已认款 2 未认款") - private String type; + @JsonProperty("subscription") + private String subscription; + + @ApiModelProperty("类型 1 已认款 2 未认款") + @JsonProperty("subscriptionKey") + private String subscriptionKey; + + @ApiModelProperty("付款方式 1 全款 2 贷款") + @JsonProperty("paymentMethod") + private String paymentMethod; + + @ApiModelProperty("付款方式 1 全款 2 贷款") + @JsonProperty("paymentMethodKey") + private String paymentMethodKey; @ApiModelProperty("客户名称") + @JsonProperty("customerName") private String name; @ApiModelProperty("车架号集合") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index d1485641c6..a585ead61f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -182,9 +182,9 @@ public interface BusDeliveredApplyFeign { public ResultBean> getRetrievalApplyList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-初始化 出库申请") - @GetMapping("/getRetrievalApplyInfo/{sid}") + @GetMapping("/getRetrievalApplyInfoBySid/{sid}") @ResponseBody - public ResultBean getRetrievalApplyInfo(@PathVariable("sid") String sid); + public ResultBean getRetrievalApplyInfoBySid(@PathVariable("sid") String sid); @ApiOperation("手机端-保存 出库申请") @PostMapping("/saveRetrievalApplyInfo") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 1b63ec1a0b..4a1f02cfe2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -141,7 +141,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { } @Override - public ResultBean getRetrievalApplyInfo(String sid) { + public ResultBean getRetrievalApplyInfoBySid(String sid) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java index 0aca1c02e9..2541a29504 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java @@ -79,7 +79,7 @@ public interface BusDeliveredMapper extends BaseMapper { * @param qw * @return */ - IPage getRetrievalNotList(IPage page, QueryWrapper qw); + IPage getRetrievalNotList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); /** * 查询车架号 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 2bb3823692..e92f0189ed 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -158,7 +158,7 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalNotList(PagerQuery pq) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(pq.getParams().getName())) { - qw.eq("name", pq.getParams().getName()); + qw.like("name", pq.getParams().getName()); } IPage page = PagerUtil.queryToPage(pq); IPage iPage = baseMapper.getRetrievalNotList(page, qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index c8a44360ae..fd6659d589 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -100,5 +100,5 @@ public interface BusDeliveredApplyMapper extends BaseMapper { * @param qw * @return */ - IPage getRetrievalApplyList(IPage page, QueryWrapper qw); + IPage getRetrievalApplyList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 18316d8046..65f14dbe8f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -209,9 +209,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { } @Override - public ResultBean getRetrievalApplyInfo(String sid) { + public ResultBean getRetrievalApplyInfoBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ResultBean retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfo(sid); + ResultBean retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid); return rb.success().setData(retrievalApplyInfo.getData()); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 598233a808..94dafebb4a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -744,7 +744,7 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalApplyInfo(String sid) { + public ResultBean getRetrievalApplyInfoBySid(String sid) { ResultBean rb = ResultBean.fireFail(); AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo(); BusDeliveredApply busDeliveredApply = fetchBySid(sid); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java index 8136582791..ad89da8a2e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java @@ -128,6 +128,10 @@ public interface ScmVehicleGressionFeign { @ResponseBody public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file); + @ApiOperation("初始化临时出门证") + @GetMapping("/temporaryExitPermitInfo/{sid}/{userSid}") + @ResponseBody + public ResultBean temporaryExitPermitInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); /*************************************************PC移位审批流程***************************************************/ diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java index 44054ad39d..1787081a0e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java @@ -116,6 +116,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign return null; } + @Override + public ResultBean temporaryExitPermitInfo(String sid, String userSid) { + return null; + } + @Override public ResultBean submitCarTransfer(SubmitCarTransferDto dto) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java new file mode 100644 index 0000000000..edec7a19d6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.scm.api.scmvehiclegression; + +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 TemporaryExitPermitInfo implements Vo { + private static final long serialVersionUID = -7815832719602641764L; + + @ApiModelProperty("分公司名称") + private String orgName; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("台数") + private String num; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("出门原因") + private String reason; + @ApiModelProperty("经办人") + private String creatName; + @ApiModelProperty("提车人") + private String carryCarName; + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java index 981d93f307..7fa97e46f5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java @@ -111,4 +111,6 @@ public interface ScmVehicleGressionMapper extends BaseMapper int selectBySid(String list); void updateStateBySid(@Param("sid") String sid, @Param("state") String state); + + int selectNum(String bill); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index b3e6f81ea9..2a2e3a344d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -90,6 +90,12 @@ and find_in_set(sid, #{list}) + + UPDATE scm_vehicle_gression SET nodeState=#{nodeState} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java index 0bfe8fb874..65ff163fe7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -200,6 +200,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { return rb.success().setData(data).setMsg("上传成功"); } + @Override + public ResultBean temporaryExitPermitInfo(String sid,String userSid) { + return scmVehicleGressionService.temporaryExitPermitInfo(sid,userSid); + } + @Override public ResultBean submitCarTransfer(SubmitCarTransferDto dto) { return scmVehicleGressionService.submitCarTransfer(dto); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index b9c6f1502e..29e2c0955f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -29,8 +29,14 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.VehicleGression; +import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto; +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.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -39,6 +45,9 @@ 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.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.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -105,6 +114,12 @@ public class ScmVehicleGressionService extends MybatisBaseService createQueryWrapper(ScmVehicleGressionQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -279,18 +294,23 @@ public class ScmVehicleGressionService extends MybatisBaseService stringStringMap = generateBillNo(userSid); - scmVehicleGression.setApplicantNo(stringStringMap.get("billNo_Num")); + //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号 + //获取单据名称大写首字母+分公司编码+年份+月份 +// Map stringStringMap = generateBillNo(userSid); + String billNo = getApplyCode(dto); + scmVehicleGression.setApplicantNo(billNo); save(scmVehicleGression); if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 List factoryImage = dto.getPolicyImage(); @@ -456,48 +476,63 @@ public class ScmVehicleGressionService extends MybatisBaseService generateBillNo(String userSid) { - List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData(); - String billsType = ""; - if (commonVoList.size() > 0) { - for (int i = 0; i < commonVoList.size(); i++) { - if (commonVoList.get(i).getDictValue().contains("移位单")) { - billsType = commonVoList.get(i).getDictKey(); - } - } - } - AppUserOrgInfoVo userOrgInfo = null; - String orgCode = ""; - String orgSid = ""; - String orgName = ""; - ResultBean resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid); - if (resultBean.getSuccess() && resultBean.getData() != null) { - userOrgInfo = resultBean.getData(); - orgSid = userOrgInfo.getOrgSid(); - orgName = userOrgInfo.getOrgName(); - orgCode = userOrgInfo.getOrgCode(); - } - String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); - // 流水号 - int i = selectCountByOrgSid(billsType, date, orgSid); - String num = String.format("%04d", i + 1); // 不足4位补0 - Map map = new HashMap<>(); - map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num); - map.put("billNo", billsType + orgCode + date.replaceAll("-", "")); - map.put("staffSid", userOrgInfo.getStaffSid()); - map.put("staffName", userOrgInfo.getStaffName()); - map.put("orgSid", orgSid); - map.put("orgName", orgName); - - return map; + public String getApplyCode(AppScmVehicleGressionDto dto) { + String userSid = dto.getUserSid(); + //获取分公司sid + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.KCDDBGSQ.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; } +// /** +// * 移位单生成编号 +// * +// * @param userSid 用户sid +// * @return +// */ +// public Map generateBillNo(String userSid) { +// List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData(); +// String billsType = ""; +// if (commonVoList.size() > 0) { +// for (int i = 0; i < commonVoList.size(); i++) { +// if (commonVoList.get(i).getDictValue().contains("移位单")) { +// billsType = commonVoList.get(i).getDictKey(); +// } +// } +// } +// AppUserOrgInfoVo userOrgInfo = null; +// String orgCode = ""; +// String orgSid = ""; +// String orgName = ""; +// ResultBean resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid); +// if (resultBean.getSuccess() && resultBean.getData() != null) { +// userOrgInfo = resultBean.getData(); +// orgSid = userOrgInfo.getOrgSid(); +// orgName = userOrgInfo.getOrgName(); +// orgCode = userOrgInfo.getOrgCode(); +// } +// String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); +// // 流水号 +// int i = selectCountByOrgSid(billsType, date, orgSid); +// String num = String.format("%04d", i + 1); // 不足4位补0 +// Map map = new HashMap<>(); +// map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num); +// map.put("billNo", billsType + orgCode + date.replaceAll("-", "")); +// map.put("staffSid", userOrgInfo.getStaffSid()); +// map.put("staffName", userOrgInfo.getStaffName()); +// map.put("orgSid", orgSid); +// map.put("orgName", orgName); +// +// return map; +// } + public int selectCountByOrgSid(String billsType, String date, String orgSid) { return baseMapper.selectCountByOrgSid(billsType, date, orgSid); } @@ -535,9 +570,9 @@ public class ScmVehicleGressionService extends MybatisBaseService map = new HashMap<>(); - map.put("isTrue", isTrue); - bv.setFormVariables(map); +// boolean isTrue = false; +// if (StringUtils.isNotBlank(scmVehicleGression.getApplicantFunds())) { +// if ("0".equals(scmVehicleGression.getApplicantFunds())) { +// isTrue = false; +// } else { +// isTrue = true; +// } +// } else { +// isTrue = false; +// } +// Map map = new HashMap<>(); +// map.put("isTrue", isTrue); +// bv.setFormVariables(map); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -667,10 +702,10 @@ public class ScmVehicleGressionService extends MybatisBaseService> rb = new ResultBean<>(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - Map formVariables = query.getFormVariables(); +// Map formVariables = query.getFormVariables(); //判断流程分支 - Map map = IsTrue(formVariables.get("businessSid")); - bv.setFormVariables(map); +// Map map = IsTrue(formVariables.get("businessSid")); +// bv.setFormVariables(map); bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo @@ -688,10 +723,10 @@ public class ScmVehicleGressionService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - Map formVariables = query.getFormVariables(); +// Map formVariables = query.getFormVariables(); //判断流程分支 - Map map = IsTrue(formVariables.get("businessSid")); - bv.setFormVariables(map); +// Map map = IsTrue(formVariables.get("businessSid")); +// bv.setFormVariables(map); bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo @@ -816,7 +851,7 @@ public class ScmVehicleGressionService extends MybatisBaseService temporaryExitPermitInfo(String sid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + TemporaryExitPermitInfo temporaryExitPermitInfo = new TemporaryExitPermitInfo(); + ScmVehicleGression scmVehicleGression = fetchBySid(sid); + SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData(); + temporaryExitPermitInfo.setCustomerName("-"); + temporaryExitPermitInfo.setOrgName(sysOrganization.getName()); + temporaryExitPermitInfo.setDate(new Date()); + temporaryExitPermitInfo.setContractNo("-"); + BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData(); + ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), userSid).getData(); + temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor()); + temporaryExitPermitInfo.setNum("1"); + temporaryExitPermitInfo.setVinNo(scmVehicleGression.getVinNo()); + temporaryExitPermitInfo.setReason("存放地点变更"); + temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator()); + temporaryExitPermitInfo.setCarryCarName("-"); + return rb.success().setData(temporaryExitPermitInfo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 42e76a1d94..25115ae0dd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -69,7 +69,7 @@ public interface AppBusDeliveredApplyFeign { @ApiOperation("移动端-获取待出库列表") @PostMapping("/getRetrievalNotList") @ResponseBody - public ResultBean> getRetrievalNotList(@RequestBody PagerQuery pq); + public ResultBean> getRetrievalNotList(@RequestBody PagerQuery pagerQuery); @ApiOperation("移动端-初始化 出库申请 待出库进入") @PostMapping("/getRetrievalApplyInfo") @@ -82,9 +82,9 @@ public interface AppBusDeliveredApplyFeign { public ResultBean> getRetrievalApplyList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-初始化 出库申请") - @GetMapping("/getRetrievalApplyInfo/{sid}") + @GetMapping("/getRetrievalApplyInfoBySid/{sid}") @ResponseBody - public ResultBean getRetrievalApplyInfo(@PathVariable("sid") String sid); + public ResultBean getRetrievalApplyInfoBySid(@PathVariable("sid") String sid); @ApiOperation("手机端-保存 出库申请") @PostMapping("/saveRetrievalApplyInfo") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index 3b286d31b3..8bb3dbd944 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -52,7 +52,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe @Override - public ResultBean> getRetrievalNotList(PagerQuery pq) { + public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { return null; } @@ -67,7 +67,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe } @Override - public ResultBean getRetrievalApplyInfo(String sid) { + public ResultBean getRetrievalApplyInfoBySid(String sid) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java index fc26d9fe59..131605d1a2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -11,11 +12,23 @@ import java.util.List; public class DeliveredPageVo implements Vo { private static final long serialVersionUID = 5016267000560011865L; + @ApiModelProperty("列表sid") + private String sid; + @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("类型 1 已认款 2 未认款") - private String type; + private String subscription; + + @ApiModelProperty("类型 1 已认款 2 未认款") + private String subscriptionKey; + + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethod; + + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethodKey; @ApiModelProperty("客户名称") private String name; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 0377c896bb..68c3bc72c9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -57,34 +57,36 @@ import java.util.List; @RequestMapping("/autoservice/v1/retrieval") public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { + @Autowired + AppBusDeliveredApplyService appBusDeliveredApplyService; @Override - public ResultBean> getRetrievalNotList(PagerQuery pq) { - return null; + public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { + return appBusDeliveredApplyService.getRetrievalNotList(pagerQuery); } @Override public ResultBean getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { - return null; + return appBusDeliveredApplyService.getRetrievalApplyInfo(query); } @Override public ResultBean> getRetrievalApplyList(PagerQuery pagerQuery) { - return null; + return appBusDeliveredApplyService.getRetrievalApplyList(pagerQuery); } @Override - public ResultBean getRetrievalApplyInfo(String sid) { - return null; + public ResultBean getRetrievalApplyInfoBySid(String sid) { + return appBusDeliveredApplyService.getRetrievalApplyInfoBySid(sid); } @Override public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { - return null; + return appBusDeliveredApplyService.saveRetrievalApplyInfo(deliveredApplyDto); } @Override public ResultBean> getRetrievalCarVin(String sid) { - return null; + return appBusDeliveredApplyService.getRetrievalCarVin(sid); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 830b7ca2af..a2083a8acc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -25,12 +25,26 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.autoservice.retrieval; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.busdelivered.*; +import com.yxt.anrui.buscenter.api.busdeliveredapply.*; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; +import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.terminal.api.autoservice.retrieval.*; +import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionInfoVo; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo; +import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: anrui-buscenter(业务管理)
@@ -48,16 +62,59 @@ import org.springframework.stereotype.Service; @Service public class AppBusDeliveredApplyService { + @Autowired + BusDeliveredFeign busDeliveredFeign; + + @Autowired + BusDeliveredApplyFeign busDeliveredApplyFeign; + + public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> retrievalNotList = busDeliveredFeign.getRetrievalNotList(pq); + PagerVo vo = CoverUtils.selectPagerVo(retrievalNotList.getData()); + return rb.success().setData(vo); + } + + public ResultBean getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { + ResultBean rb = ResultBean.fireFail(); + AppDeliveredDetailsQuery appDeliveredDetailsQuery = new AppDeliveredDetailsQuery(); + BeanUtils.copyProperties(query, appDeliveredDetailsQuery); + ResultBean retrievalApplyInfo = busDeliveredFeign.getRetrievalApplyInfo(appDeliveredDetailsQuery); + AppDeliveredDetailsVo appDeliveredDetailsVo = retrievalApplyInfo.getData(); + DeliveredDetailsVo vo = new DeliveredDetailsVo(); + BeanUtils.copyProperties(appDeliveredDetailsVo, vo); + return rb.success().setData(vo); + } + public ResultBean> getRetrievalApplyList(PagerQuery pagerQuery) { - return null; + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> retrievalApplyList = busDeliveredApplyFeign.getRetrievalApplyList(pq); + PagerVo vo = CoverUtils.selectPagerVo(retrievalApplyList.getData()); + return rb.success().setData(vo); } - public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { - return null; + public ResultBean getRetrievalApplyInfoBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + DeliveredApplyInfoVo vo = new DeliveredApplyInfoVo(); + ResultBean resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData(); + BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo); + return rb.success().setData(vo); } + public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { + AppDeliveredApplyDto dto = new AppDeliveredApplyDto(); + BeanUtil.copyProperties(deliveredApplyDto, dto); + ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto); + return resultBean; + } - public ResultBean getRetrievalApplyInfo(DeliveredApplyInfoQuery query) { + public ResultBean> getRetrievalCarVin(String sid) { return null; } } \ No newline at end of file