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 015c68395b..d53358f15b 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 @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -31,7 +32,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo { private String inspectedDate; @ApiModelProperty("洗车费") - private String price; + private BigDecimal 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 841f5c9fe7..c1895fd318 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 @@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -44,7 +45,7 @@ public class AppScmVehicleExamineDto implements Dto { private String address; @ApiModelProperty("洗车费") - private String price; + private BigDecimal price; } 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 744eb8a320..7a7a6545cb 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 @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -43,7 +44,7 @@ public class AppScmVehicleExamineInfoVo implements Vo { private String address; @ApiModelProperty("洗车费") - private String price; + private BigDecimal price; 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 ca3966af45..034c9ef625 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 @@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -43,7 +44,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto { private String address; @ApiModelProperty("洗车费") - private String price; + private BigDecimal price; } 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 2c667a165c..bcedd91936 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 @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: scm(scm)
* File: ScmVehicleExamine.java
@@ -81,5 +83,5 @@ public class ScmVehicleExamine extends BaseEntity { @ApiModelProperty("验车状态(已验车,未验车)") private String inspectionResult; // 验车状态(已验车,未验车) @ApiModelProperty("洗车费") - private String price; + private BigDecimal price; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml index 9aa1146fd2..e6fa443c40 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml @@ -34,7 +34,7 @@ ${ew.sqlSegment} - and concat(sve.vin , sve.modelName ,sve.purchaseType ) LIKE concat('%', #{names}, '%') + and concat(sve.vinNo , sve.modelName ,sve.purchaseType ) LIKE concat('%', #{names}, '%') ORDER BY id DESC diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java index 670c55a0e7..dd7b0c59bd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java @@ -138,9 +138,7 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign { @ApiOperation("手机端-保存验车单") @PostMapping("/saveCarWarehousingInfo") public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) { - ResultBean rb = ResultBean.fireFail(); - scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto); - return rb.success(); + return scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto); } @Override 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 5fa13004be..2a819a5c52 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 @@ -282,8 +282,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService scmFiles1 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type1); for (ScmFile scmFile : scmFiles1) { @@ -266,7 +271,10 @@ public class ScmVehicleExamineService extends MybatisBaseService carInspectedImages = new ArrayList<>(); AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid); - + if (vo.getPrice() == null || vo.getPrice().equals("")) { + BigDecimal bigDecimal = new BigDecimal("0.00"); + vo.setPrice(bigDecimal); + } List scmFiles1 = scmFileService.selectByLinkSid(inspectedSid, type1); for (ScmFile scmFile : scmFiles1) { factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); @@ -289,6 +297,15 @@ public class ScmVehicleExamineService extends MybatisBaseService diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml index 443337d72a..9b9535f42c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml @@ -27,7 +27,7 @@ location, address FROM scm_vehicle_patrolinspectionsheet - WHERE sid = #{recordSid} + WHERE patrolInspectionSid = #{recordSid}