优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@@ -90,4 +90,5 @@ public class BusMainDeposit extends BaseEntity {
     @ApiModelProperty(value = "环节定义的ID")
     private String taskDefKey;
 
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -164,4 +164,6 @@ public class AppBusSalesOrderVo implements Vo {
 
     @ApiModelProperty("审批结束时间")
     private String endTime;
+    @ApiModelProperty("车架号显示")
+    private String vinNo;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -775,6 +775,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setCreateBySid(dto.getUserSid());
             busMainDeposit.setDepositBillType("订金收取");
             busMainDeposit.setDepositBillTypeKey("01");
+            busMainDeposit.setOrgSidPath(dto.getOrgPath());
             busMainDeposit.setCreateDate(dateFormat.format(new Date()));
             baseMapper.insert(busMainDeposit);
             BusDeposit busDeposit = new BusDeposit();
@@ -2116,16 +2117,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusMainDeposit busMainDeposit = fetchBySid(bv.getBusinessSid());
-        /*
-        String userSid = bv.getUserSid();
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        bv.setOrgSidPath(data.getOrgSidPath());
-        */
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("virtualOrderSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(busMainDeposit.getOrgSidPath());
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             log.info("流程返回：{}", JSONObject.toJSONString(resultBean));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5752,6 +5752,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            List<String> vinList = busSalesOrderVehicleService.selectList(record.getSaleOrderSid());
+            record.setVinNo(String.join(",",vinList));
             record.setShowStopBtn(false);
             record.setShowContractBtn(false);
             if (StringUtils.isNotBlank(record.getCustomerImage())) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -114,4 +114,6 @@ public class BusOrderSalesVo implements Vo {
     private String contractId;
     @ApiModelProperty("销售专员")
     private String saler;
+    @ApiModelProperty("车架号的展示")
+    private String vinNo;
 }