From 799151bceec37f84912c8d3933507ce983f8128e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 28 Sep 2022 09:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E8=BF=94=E5=88=A9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82=E5=B7=A1=E6=A3=80=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=E3=80=81=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicle/BaseVehicleFeign.java     |  5 ++++
 .../basevehicle/BaseVehicleFeignFallback.java |  5 ++++
 .../biz/basevehicle/BaseVehicleMapper.java    |  3 ++
 .../biz/basevehicle/BaseVehicleMapper.xml     | 29 ++++++++++++++-----
 .../base/biz/basevehicle/BaseVehicleRest.java | 10 +++++++
 .../biz/basevehicle/BaseVehicleService.java   | 15 ++++++++++
 6 files changed, 60 insertions(+), 7 deletions(-)

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 4e88d03800..e5237d115c 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
@@ -399,4 +399,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/getInspectionVinList")
     @ResponseBody
     public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(@RequestBody PagerQuery<InspectionVinQuery> pagerQuery);
+
+    @ApiOperation("PC-巡检获取车价号")
+    @PostMapping("/getPCInspectionVinList")
+    @ResponseBody
+    public ResultBean<List<Map<String,String>>> getPCInspectionVinList(@RequestBody InspectionVinQuery query);
 }
\ No newline at end of file
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 08bd348de4..119f5e14f0 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
@@ -311,4 +311,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getPCInspectionVinList(InspectionVinQuery query) {
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
index a164f0669b..95b3a47369 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@@ -458,4 +458,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<InspectionVinVo> getInspectionVinList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
 
     List<BaseSpecialRebateDisGetVehVo> getVehBySpecialRebateSid(String specialRebateSid);
+
+    List<Map<String,String>> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
+
 }
\ No newline at end of file
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 cb779ab7be..1571fd98fb 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
@@ -1146,14 +1146,29 @@
 
     <select id="getInspectionVinList" resultType="com.yxt.anrui.base.api.basevehicle.InspectionVinVo">
         select
-            sid as carSid,
-            vinNo as vin,
-            location as addressSid,
-            locationName as address,
-            modelName as  model,
-            modelSid
+        sid as carSid,
+        vinNo as vin,
+        location as addressSid,
+        locationName as address,
+        modelName as model,
+        modelSid
         from
-            base_vehicle bv
+        base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getPCInspectionVinList" resultType="java.util.Map">
+        select
+        sid as carSid,
+        vinNo as vin,
+        location as addressSid,
+        locationName as address,
+        modelName as model,
+        modelSid
+        from
+        base_vehicle bv
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 7de72ea0e8..da541995d6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -889,4 +889,14 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return new ResultBean<PagerVo<InspectionVinVo>>().success().setData(pagerVo);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getPCInspectionVinList(InspectionVinQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        List<Map<String, String>> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query);
+        return rb.success().setData(pcInspectionVinList);
+    }
+
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 9c97e99ccd..3257d5fd18 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2536,4 +2536,19 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return iPage;
     }
+
+    public List<Map<String, String>> getPCInspectionVinList(InspectionVinQuery query) {
+        QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
+        qw.eq("bv.createOrgSid", query.getUseOrgSid());
+        qw.eq("bv.isDelete", 0);
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        List<Map<String, String>> pcInspectionVinList = baseMapper.getPCInspectionVinList(qw);
+        for (Map<String, String> record : pcInspectionVinList) {
+            String addressSid = record.get("addressSid");
+            ScmWarehouseVo data = scmWarehouseFeign.selectByAddressSid(addressSid).getData();
+            record.put("administratorsSid",data.getLibTubeSid());
+            record.put("administratorsName",data.getLibTubeName());
+        }
+        return pcInspectionVinList;
+    }
 }
\ No newline at end of file