移动端验车添加车型配置信息

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

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

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) <br/>
@@ -111,6 +110,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
 
     @Autowired
     BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
+    @Autowired
+    private AppSubsetVersionFeign appSubsetVersionFeign;
 
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
@@ -282,6 +283,21 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         } else {
             vo.setEditVin(false);
         }
+        //添加车型相关开始
+        ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
+        AppSubVersionVo appSubVersionVo = resultBean.getData();
+        AppScmVehicleVersionVo appVehicleVersionVo = new AppScmVehicleVersionVo();
+        String modelSid = vo.getModelSid();
+        String configSid = vo.getConfigSid();
+        Map<String, Object> 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<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
         List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
         for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {

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

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