From 4f326a8fde9b58c297fcbdebb95c28608b72a94f Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Mon, 8 Aug 2022 12:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E5=8D=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppScmVehicleExamineDetailsVo.java             |  2 +-
 .../scmvehicleexamine/AppScmVehicleExamineDto.java |  2 +-
 .../AppScmVehicleExamineSubmitDto.java             |  2 +-
 .../api/scmvehicleexamine/ScmVehicleExamine.java   |  2 +-
 .../ScmVehicleExamineService.java                  |  5 +----
 .../ScmVehiclePatrolinspectionMapper.xml           | 14 +++++++-------
 6 files changed, 12 insertions(+), 15 deletions(-)

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 67fcf57b3f..7d9745c97e 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
@@ -32,7 +32,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
     private String inspectedDate;
 
     @ApiModelProperty("洗车费")
-    private BigDecimal price;
+    private String price;
 
     @ApiModelProperty(" 1 已验车  2 未验车 验车状态")
     private String state;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
index 9020e14d1f..85c8adf832 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java
@@ -55,7 +55,7 @@ public class AppScmVehicleExamineDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private Integer price;
+    private String price;
 
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java
index 18a72fad65..dfe0c76358 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java
@@ -43,7 +43,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private Integer price;
+    private String price;
 
     @ApiModelProperty("车型配置差异说明")
     private String modelDifferenceExplain; // 车型配置差异说明
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
index b0cf65b74d..1eeb200ca9 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
@@ -83,7 +83,7 @@ public class ScmVehicleExamine extends BaseEntity {
 	@ApiModelProperty("验车状态（已验车，未验车）")
     private String inspectionResult; // 验车状态（已验车，未验车）
     @ApiModelProperty("洗车费")
-    private Integer price;
+    private String price;
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("分公司sid")
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 d93992d386..1adb9097e2 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
@@ -320,10 +320,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         }
         vo.setInspectList(inspectionItemVos);
 
-        if (vo.getPrice() == null || vo.getPrice().equals("")) {
-            BigDecimal bigDecimal = new BigDecimal("0.00");
-            vo.setPrice(bigDecimal);
-        }
+
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(inspectedSid, type1);
         for (ScmFile scmFile : scmFiles1) {
             factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
index 0566326c94..805793f736 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
@@ -24,17 +24,17 @@
     <select id="getCarInventoryList"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
         SELECT sid,
-               mainSid              as vin,
-               location             as warehouse,
-               patrolInspectionDate as newInspectionDate,
-               patrolInspectionName as newInspectionName
+        mainSid as vin,
+        location as warehouse,
+        patrolInspectionDate as newInspectionDate,
+        patrolInspectionName as newInspectionName
         FROM scm_vehicle_patrolinspection svp
         <where>
             ${ew.sqlSegment}
             <if test="name != '' and name != null">
                 and concat(svp.mainSid) LIKE concat('%'
-                  , #{name}
-                  , '%')
+                , #{name}
+                , '%')
             </if>
         </where>
         ORDER BY id DESC
@@ -51,6 +51,6 @@
                svss.sid
         from scm_vehicle_patrolinspection svp
                  left join scm_vehicle_patrolinspectionsheet svss on svss.patrolInspectionSid = svp.sid
-        where sid = #{recordSid}
+        where svp.sid = #{recordSid}
     </select>
 </mapper>
\ No newline at end of file