diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index f3a60dd50c..def914a8f3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -228,8 +228,8 @@ public interface BaseVehicleFeign { public ResultBean getAppCurrentCarDetailVo(@PathVariable("modelSid") String modelSid); @ApiOperation("获取车架号") - @GetMapping("/getVins/{modelSid}/{configSid}") - public ResultBean> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + @GetMapping("/getVins/{modelSid}/{configSid}/{userSid}") + public ResultBean> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid); @ApiOperation("手机端业务-车型报价-列表(新)") @PostMapping("/getModelList") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index af17bf9b53..aac310dc54 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -152,7 +152,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> getVins(String modelSid, String configSid) { + public ResultBean> getVins(String modelSid, String configSid, String userSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index d1f52621b3..946fd5a942 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -555,22 +555,21 @@ public class BaseModelConfigService extends MybatisBaseService pagerQuery) { - String userSid = pagerQuery.getParams().getUserSid(); // 1、根据业务员部门sid查询分公司 查询orgSidPath(部门路径) String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - /*SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData(); - if (data != null) { - // 2) 根据orgSidPath(部门路径)判断分公司sid - pagerQuery.getParams().setUseOrg(data.getSid()); - }*/ String modelSid = pagerQuery.getParams().getModelSid(); -// String useOrgSid = data.getSid(); AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid); - String type = "0002"; - String path = fileUploadComponent.getUrlPrefix(); - List modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path); - vo.setModelImage(modelImages); + List modelImages = baseVehicleModelAppendixService.selectImageList(modelSid); + List modelImagesList = new ArrayList<>(); + if (!modelImages.isEmpty()) { + for (int i = 0; i < modelImages.size(); i++) { + if (!modelImages.get(i).contains(fileUploadComponent.getUrlPrefix())) { + modelImagesList.add(fileUploadComponent.getUrlPrefix() + modelImages.get(i)); + } + } + } + vo.setModelImage(modelImagesList); //基础配置拼接 List list = new ArrayList<>(); @@ -597,7 +596,7 @@ public class BaseModelConfigService extends MybatisBaseService { * @param configSid * @return */ - List getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("state")String state); + List getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("state")String state,@Param("orgSid")String orgSid); /** * 现车分页列表(新) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index ef43fa7f59..01763d3c2e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -441,6 +441,7 @@ WHERE bv.modelSid = #{modelSid} AND bv.modelConfigSid = #{configSid} AND bv.lockedState = #{state} + and bv.useOrg = #{orgSid} select bv.sid, - bv.vinNo, - bv.vehicleStateValue, - bv.location, - bv.priceDate, - bv.guidedPrice + bv.vinNo, + bv.vehicleStateValue, + bv.location, + bv.priceDate, + bv.guidedPrice from base_vehicle bv where bv.vinNo = #{vinNo} @@ -760,7 +761,8 @@ select filePath from base_vehicle_appendix where linkSid = #{vehicleSid} - and attachType = '0001' limit 1 + and attachType = '0001' + limit 1