From 55964a2ca63167cc52a5fb75ae41a577b93e0fcb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 31 Mar 2023 15:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BD=A6=E8=BE=86=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sSalesOrderReturnVehApplyByOrderSidVo.java | 34 ++++ .../BusSalesOrderReturnVehApplyFeign.java | 11 +- ...SalesOrderReturnVehApplyFeignFallback.java | 4 + .../BusSalesOrderReturnVehApplyMapper.java | 8 + .../BusSalesOrderReturnVehApplyMapper.xml | 23 ++- .../BusSalesOrderReturnVehApplyRest.java | 159 +++++++++--------- .../BusSalesOrderReturnVehApplyService.java | 56 +++--- .../AppBusSalesOrderRetVehFeign.java | 7 + .../AppBusSalesOrderRetVehFeignFallback.java | 5 + ...sSalesOrderReturnVehApplyByOrderSidVo.java | 31 ++++ .../AppBusSalesOrderRetVehRest.java | 5 + .../AppBusSalesOrderRetVehService.java | 8 + 12 files changed, 248 insertions(+), 103 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyByOrderSidVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderReturnVehApplyByOrderSidVo.java 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/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java index 1ca4c4b69d..51d62959c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyByOrderSidVo; import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -76,4 +77,11 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper 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..69ca4ab889 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); + for (BusSalesOrderReturnVehApplyByOrderSidVo applyByOrderSidVo : list) { + if (StringUtils.isNotBlank(applyByOrderSidVo.getFilePath())) { + String filePath = applyByOrderSidVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + applyByOrderSidVo.setFilePath(filePath); + } + } + return ResultBean.fireSuccess().setData(list); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeign.java index 47ef630732..a3676469cc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeign.java @@ -69,4 +69,11 @@ public interface AppBusSalesOrderRetVehFeign { @PutMapping("/stopSalesOrderRetVehInfo") @ResponseBody ResultBean stopSalesOrderRetVehInfo(@RequestBody SaleOrderRetVehTaskQuery query); + + @ApiOperation("根据销售订单sid查询退车列表") + @GetMapping("/listPageByOrderSid/{orderSid}") + @ResponseBody + public ResultBean listPageByOrderSid(@PathVariable("orderSid") String orderSid); + + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeignFallback.java index fbb3ed3f76..4a2b546a5a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeignFallback.java @@ -97,4 +97,9 @@ public class AppBusSalesOrderRetVehFeignFallback implements AppBusSalesOrderRetV public ResultBean stopSalesOrderRetVehInfo(SaleOrderRetVehTaskQuery query) { return null; } + + @Override + public ResultBean listPageByOrderSid(String orderSid) { + 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/saleOrderRetVeh/AppBusSalesOrderReturnVehApplyByOrderSidVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderReturnVehApplyByOrderSidVo.java new file mode 100644 index 0000000000..a49e649fc4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderReturnVehApplyByOrderSidVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/3/31 14:33 + */ +@Data +@ApiModel(value = "根据销售订单查询退车列表 视图数据对象", description = "根据销售订单查询退车列表 视图数据对象") +public class AppBusSalesOrderReturnVehApplyByOrderSidVo { + 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-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehRest.java index 1a89295da4..90b7dfdc2e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehRest.java @@ -67,4 +67,9 @@ public class AppBusSalesOrderRetVehRest implements AppBusSalesOrderRetVehFeign { public ResultBean stopSalesOrderRetVehInfo(SaleOrderRetVehTaskQuery query) { return appBusSalesOrderRetVehService.stopSalesOrderRetVehInfo(query); } + + @Override + public ResultBean listPageByOrderSid(String orderSid) { + return appBusSalesOrderRetVehService.listPageByOrderSid(orderSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java index 5407742cd0..f1a3892d78 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java @@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.AppBusSalesOrderReturnVehApplyByOrderSidVo; import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto; import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto; @@ -41,6 +42,8 @@ import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class AppBusSalesOrderRetVehService { @@ -120,4 +123,9 @@ public class AppBusSalesOrderRetVehService { } return rb.success().setData(resultBean.getData()); } + + public ResultBean listPageByOrderSid(String orderSid) { + ResultBean> list = busSalesOrderReturnVehApplyFeign.listPageByOrderSid(orderSid); + return list; + } } \ No newline at end of file