验车单问题修改

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;

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;

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; // 车型配置差异说明

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")

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());

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>