From 6184e5e20f498bc7fff9cf18e2e7b6b817c7554b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 29 Aug 2022 09:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=AA=8C=E8=BD=A6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppScmVehicleExamineInfoVo.java | 3 +- .../AppScmVehicleVersionVo.java | 32 +++++++++++++++++++ .../ScmVehicleExamineService.java | 26 ++++++++++++--- .../scmvehicleexamine/AppExamineInfoVo.java | 2 ++ .../scmvehicleexamine/AppScmVehicleVo.java | 32 +++++++++++++++++++ 5 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java index 2d63d5ad52..4a5966bd60 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java @@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -68,4 +67,6 @@ public class AppScmVehicleExamineInfoVo implements Vo { @ApiModelProperty(value = "厂家入库日期") private String inboundDate; + private AppScmVehicleVersionVo carDetailPage; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java new file mode 100644 index 0000000000..f74b3d4002 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/29 9:22 + * @Description + */ +@Data +public class AppScmVehicleVersionVo implements Vo { + private static final long serialVersionUID = -4041552955974494273L; + + @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-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index f3c9a42f90..bfc55bd077 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -26,17 +26,19 @@ package com.yxt.anrui.scm.biz.scmvehicleexamine; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.OperVehicleState; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; @@ -60,11 +62,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Project: scm(scm)
@@ -111,6 +110,8 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { @@ -282,6 +283,21 @@ public class ScmVehicleExamineService extends MybatisBaseService resultBean = appSubsetVersionFeign.selectLast(); + AppSubVersionVo appSubVersionVo = resultBean.getData(); + AppScmVehicleVersionVo appVehicleVersionVo = new AppScmVehicleVersionVo(); + String modelSid = vo.getModelSid(); + String configSid = vo.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); + vo.setCarDetailPage(appVehicleVersionVo); + //添加车型相关结束 + List scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid); List inspectionItemVos = new ArrayList<>(); for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java index 9d808d45e7..ac849fe1d3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java @@ -67,4 +67,6 @@ public class AppExamineInfoVo implements Vo { @ApiModelProperty(value = "厂家入库日期") private String inboundDate; + private AppScmVehicleVo carDetailPage; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java new file mode 100644 index 0000000000..33fdd26dac --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/29 9:27 + * @Description + */ +@Data +public class AppScmVehicleVo implements Vo { + private static final long serialVersionUID = -5802337580742368734L; + + @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; +}