导出车辆台账

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; // 节点状态
+
+
+}

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);
+
 }

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; }
+
 }

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<BusSalesOr
 
 	@Select("SELECT * FROM bus_sales_order_return_veh_apply WHERE contractNo = #{contractId} and nodeState != '终止' and nodeState != '待提交' and nodeState != '发起申请'")
 	List<BusSalesOrderReturnVehApply> fetchByContractNo(String contractId);
+
+	/**
+	 * 根据销售订单返回退车列表
+	 * @param orderSid
+	 * @return
+	 */
+    List<BusSalesOrderReturnVehApplyByOrderSidVo> listPageByOrderSid(String orderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -48,9 +48,30 @@
     </update>
 
     <select id="selectNum" resultType="int">
-        SELECT IFNULL(CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED),0) CODE
+        SELECT IFNULL(CAST(REPLACE(MAX(applyNo), #{bill}, '') AS SIGNED), 0) CODE
         from bus_sales_order_return_veh_apply
         where applyNo LIKE concat(#{bill}, '%')
     </select>
 
+
+    <!--    根据销售订单查询退车列表-->
+    <select id="listPageByOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyByOrderSidVo">
+
+        SELECT DISTINCT
+        bso.sid,
+        bas.filePath,
+        bso.modelName,
+        bsv.vinNo,
+        bso.createTime,
+        bso.nodeState
+        FROM bus_sales_order_return_veh_apply AS bso
+        LEFT JOIN bus_sales_order_return_veh AS bsv
+        ON bso.sid = bsv.mainSid
+        LEFT JOIN anrui_base.base_vehicle_model_appendix AS bas
+        ON bso.modelSid = bas.modelSid
+        WHERE bso.orderSid = #{orderSid}
+
+    </select>
+
 </mapper>

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(销售订单退车) <br/>
  * File: BusSalesOrderReturnVehApplyFeignFallback.java <br/>
@@ -63,79 +58,87 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderRetu
 @RequestMapping("v1/bussalesorderreturnvehapply")
 public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehApplyFeign {
 
-	@Autowired
+    @Autowired
-	private BusSalesOrderReturnVehApplyService busSalesOrderReturnVehApplyService;
+    private BusSalesOrderReturnVehApplyService busSalesOrderReturnVehApplyService;
-
+
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderReturnVehApplyVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehApplyQuery> pq){
+    public ResultBean<PagerVo<BusSalesOrderReturnVehApplyVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderReturnVehApplyVo> pv = busSalesOrderReturnVehApplyService.listPageVo(pq);
+        PagerVo<BusSalesOrderReturnVehApplyVo> pv = busSalesOrderReturnVehApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto){
+    public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto) {
-		return busSalesOrderReturnVehApplyService.saveOrUpdateDto(dto);
+        return busSalesOrderReturnVehApplyService.saveOrUpdateDto(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		return busSalesOrderReturnVehApplyService.delAll(sids);
+        return busSalesOrderReturnVehApplyService.delAll(sids);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		return busSalesOrderReturnVehApplyService.fetchDetailsVoBySid(sid);
+        return busSalesOrderReturnVehApplyService.fetchDetailsVoBySid(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
-		return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid);
+        return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
+    public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
-		return busSalesOrderReturnVehApplyService.submitVehicleApply(dto);
+        return busSalesOrderReturnVehApplyService.submitVehicleApply(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) {
+    public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) {
-		BusinessVariables bv = new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
+        BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
+        bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
-		return busSalesOrderReturnVehApplyService.complete(bv);
+        return busSalesOrderReturnVehApplyService.complete(bv);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
-		return busSalesOrderReturnVehApplyService.getPreviousNodesForReject(query);
+        return busSalesOrderReturnVehApplyService.getPreviousNodesForReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
-		return busSalesOrderReturnVehApplyService.getNextNodesForSubmit(query);
+        return busSalesOrderReturnVehApplyService.getNextNodesForSubmit(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) {
+    public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) {
-		return busSalesOrderReturnVehApplyService.taskReject(query);
+        return busSalesOrderReturnVehApplyService.taskReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+    public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
-		return busSalesOrderReturnVehApplyService.revokeProcess(query);
+        return busSalesOrderReturnVehApplyService.revokeProcess(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+    public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
-		return busSalesOrderReturnVehApplyService.breakProcess(query);
+        return busSalesOrderReturnVehApplyService.breakProcess(query);
-	}
+    }
+
+    @Override
+    public ResultBean listPageByOrderSid(String orderSid) {
+
+        return busSalesOrderReturnVehApplyService.listPageByOrderSid(orderSid);
+    }
+
+
 }

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<BusSa
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
         String applyNo = "";
-        if (StringUtils.isNotBlank(dto.getUseOrgSid())){
+        if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
             applyNo = getXSDDTCSQApplyCode(dto.getUseOrgSid());
-        }else {
+        } else {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
             applyNo = getXSDDTCSQApplyCode(sysOrganizationVo.getSid());
             entity.setUseOrgSid(sysOrganizationVo.getSid());
@@ -265,7 +257,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         //创建二次提交申请对象
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApplyECTJ = null;
         //若销售订单详情为空，则代表为二次回显，参数为申请sid
-        if (appOrderDetailsVo == null){
+        if (appOrderDetailsVo == null) {
             //查询申请信息
             busSalesOrderReturnVehApplyECTJ = fetchBySid(orderSid);
             //根据申请中销售订单sid查询销售订单详情
@@ -276,7 +268,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         BaseModelConfigSelectVo baseModelConfigSelectVo = baseModelConfigFeign.details(modelInfo.getConfigSid()).getData();
         List<BusSalesOrderReturnVehApply> busSalesOrderReturnVehApplies = baseMapper.fetchByContractNo(appOrderDetailsVo.getContractId());
         List<String> spVehSids = new ArrayList<>();
-        if (busSalesOrderReturnVehApplies.size() > 0){
+        if (busSalesOrderReturnVehApplies.size() > 0) {
             for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) {
                 List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid());
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
@@ -285,10 +277,10 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }
         }
         for (VinListsVo vinListsVo : vinListsVos) {
-            if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
+            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
                 BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
                 String vinSid = vinListsVo.getVinSid();
-                if (spVehSids.contains(vinSid)){
+                if (spVehSids.contains(vinSid)) {
                     continue;
                 }
                 BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
@@ -297,10 +289,10 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
                 busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
                 busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
-                if (baseVehicleCertificateVo != null){
+                if (baseVehicleCertificateVo != null) {
                     busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
                     busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
-                }else {
+                } else {
                     busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
                     busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
                 }
@@ -313,12 +305,13 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
             }
         }
-        if (busSalesOrderReturnVehApplyECTJ != null){
+        if (busSalesOrderReturnVehApplyECTJ != null) {
-            if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")){
+            if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) {
                 BusSalesOrderReturnVehApplyDetailsVo data = fetchDetailsVoBySid(busSalesOrderReturnVehApplyECTJ.getSid()).getData();
                 data.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
                 return rb.success().setData(data);
-            };
+            }
+            ;
         }
         busSalesOrderReturnVehApplyDetailsVo.setOrderSid(orderSid);
         //制单日期
@@ -396,7 +389,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         List<BusSalesOrderReturnVehDto> busSalesOrderReturnVehs = dto.getBusSalesOrderReturnVehs();
         List<BusSalesOrderReturnVehApply> busSalesOrderReturnVehApplies = baseMapper.fetchByContractNo(dto.getContractNo());
         List<String> spVehSids = new ArrayList<>();
-        if (busSalesOrderReturnVehApplies.size() > 0){
+        if (busSalesOrderReturnVehApplies.size() > 0) {
             for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) {
                 List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid());
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
@@ -405,7 +398,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }
         }
         for (BusSalesOrderReturnVehDto busSalesOrderReturnVeh : busSalesOrderReturnVehs) {
-            if (spVehSids.contains(busSalesOrderReturnVeh.getVehSid())){
+            if (spVehSids.contains(busSalesOrderReturnVeh.getVehSid())) {
                 return rb.setMsg("选择的车辆申请已存在，请重新选择");
             }
         }
@@ -748,4 +741,23 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         String billNo = Rule.getBillNo(bill, i);
         return billNo;
     }
+
+    /**
+     * 根据销售订单返回退车列表
+     *
+     * @param orderSid 销售订单sid
+     * @return
+     */
+    public ResultBean listPageByOrderSid(String orderSid) {
+        List<BusSalesOrderReturnVehApplyByOrderSidVo> 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);
+    }
 }

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);
+
+
 }

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;
+    }
 }

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; // 节点状态
+
+}

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);
+    }
 }

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<AppBusSalesOrderReturnVehApplyByOrderSidVo>> list = busSalesOrderReturnVehApplyFeign.listPageByOrderSid(orderSid);
+        return list;
+    }
 }