diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java index 562c30f6e6..c03616cede 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java @@ -44,4 +44,8 @@ public class AppVehicleApplyListVo implements Vo { @ApiModelProperty("厂家销售通路") private String actualPay; + + private String modelSid; + private String configSid; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 0fcc5e8077..04cfef900c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -5,16 +5,16 @@ select bo.sid linkSid, bo.orderNo linkNo, bo.orderDate linkText, bo.platformNo, bo.lockingNum from bus_vehicle_apply_detail bd - left join bus_vehicle_apply bv on bd.applySid = bv.sid - left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid - ${ew.customSqlSegment} + left join bus_vehicle_apply bv on bd.applySid = bv.sid + left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid + ${ew.customSqlSegment} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyCarPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyCarPageVo.java new file mode 100644 index 0000000000..4b26b96e52 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyCarPageVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.supplychain.vehicleApply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/28 14:39 + * @Description + */ +@Data +public class VehicleApplyCarPageVo implements Vo { + private static final long serialVersionUID = 1220937899203455677L; + + @ApiModelProperty("版本编码") + private Integer moduleVersion; + + @ApiModelProperty("apk下载地址") + private String path; + + @ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件") + private String type; + + @ApiModelProperty("插件名称") + private String modulePluginName; + + @ApiModelProperty("地址") + private String moduleAction; + + private String json; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java index 0eaf5133b1..1b2503bd51 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java @@ -44,4 +44,10 @@ public class VehicleApplyListVo implements Vo { @ApiModelProperty("厂家销售通路") @JsonProperty("saleRoad") private String actualPay; + @ApiModelProperty("车型信息") + private VehicleApplyCarPageVo carDetailPage; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index 3fedf6c028..d250665063 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.biz.supplychain.vehicleApply; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo; @@ -8,10 +9,14 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto; import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyTaskQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; 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.supplychain.vehicleApply.VehicleApplyCarPageVo; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyListVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplySzVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDto; @@ -23,7 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Author dimengzhe @@ -39,6 +46,8 @@ public class VehicleApplyService { private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private AppSubsetVersionFeign appSubsetVersionFeign; public ResultBean getVehicleApply(String sid) { ResultBean rb = ResultBean.fireFail(); @@ -46,8 +55,23 @@ public class VehicleApplyService { if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } + ResultBean voResultBean = appSubsetVersionFeign.selectLast(); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); VehicleApplyVo vehicleApplyVo = new VehicleApplyVo(); BeanUtil.copyProperties(resultBean.getData(), vehicleApplyVo); + List records = vehicleApplyVo.getRecords(); + for (VehicleApplyListVo record : records) { + VehicleApplyCarPageVo appVehicleVersionVo = new VehicleApplyCarPageVo(); + String modelSid = record.getModelSid(); + String configSid = record.getConfigSid(); + Map map = new HashMap<>(); + map.put("modelSid", modelSid); + map.put("configSid", configSid); + map.put("selectType", 0); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo); + record.setCarDetailPage(appVehicleVersionVo); + } return rb.success().setData(vehicleApplyVo); }