From c9fa43465e1fa07e451e2063d869f9b4288d2ec7 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Sat, 30 Jul 2022 17:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=B0=E8=BD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=AA=8C?= =?UTF-8?q?=E8=BD=A6=E8=AF=A6=E6=83=85=E9=A1=B9=E7=9B=AE=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=AA=8C?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E5=85=A5=E5=BA=93=E6=8E=A8=E9=80=81=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=AA=8C?= =?UTF-8?q?=E8=BD=A6=E7=82=B9=E5=87=BB=E5=8A=9E=E7=90=86=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicle/BaseVehicleMapper.xml | 4 ++-- .../AppScmVehicleExamineDetailsVo.java | 3 +++ .../AppScmVehicleExamineInfoVo.java | 3 ++- .../ScmVehicleEnterlibraryService.java | 14 +++++-------- .../ScmVehicleExamineService.java | 21 ++++++++++++++----- .../AppExamineDetailsVo.java | 5 ++++- 6 files changed, 32 insertions(+), 18 deletions(-) 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 bf2a976bb7..e59c4402b9 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 @@ -742,8 +742,8 @@ bv.locationName location, bv.location locationSid, - - bv.salePrice as guidedPrice, + + bv.costPrice as guidedPrice, bmc.configName, bmc.sid as configSid, DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate, diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java index ed46e36bdd..184a4bbd29 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java @@ -55,4 +55,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo { @ApiModelProperty("保修卡卡号") private String guaranteeCardNo; // 保修卡卡号 + @ApiModelProperty("检验项集合") + private List inspectList; + } 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 affbfff971..0796976216 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @Data @@ -53,6 +54,6 @@ public class AppScmVehicleExamineInfoVo implements Vo { private String guaranteeCardNo; // 保修卡卡号 @ApiModelProperty("检验项集合") - private List inspectList; + private List inspectList = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 4501d4f4c6..52efbbd7fd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -295,11 +295,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); - String data2 = pathSidByUserSid.getData(); - baseVehicleDto.setCreateOrgSid(data2); - baseVehicleDto.setUseOrgSid(data2); + baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); + baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); + baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName()); baseVehicleDto.setSettlementStatus("0"); baseVehicleDto.setLockedState("0"); baseVehicleDto.setLockedStateValue("未锁定"); @@ -308,10 +306,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService factoryImages = new ArrayList<>(); List carInspectedImages = new ArrayList<>(); - - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); - + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid); List scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid); @@ -295,6 +293,19 @@ public class ScmVehicleExamineService extends MybatisBaseService carInspectedImages = new ArrayList<>(); AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid); + + List scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid); + List inspectionItemVos = new ArrayList<>(); + for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) { + AppScmInspectionItemVo appScmInspectionItemVo = new AppScmInspectionItemVo(); + appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem()); + appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid()); + appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult()); + appScmInspectionItemVo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItemVo.getIconUrl()); + inspectionItemVos.add(appScmInspectionItemVo); + } + vo.setInspectList(inspectionItemVos); + if (vo.getPrice() == null || vo.getPrice().equals("")) { BigDecimal bigDecimal = new BigDecimal("0.00"); vo.setPrice(bigDecimal); @@ -495,8 +506,8 @@ public class ScmVehicleExamineService extends MybatisBaseService inspectList; + }