diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java index a927dee874..8fb78193d7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * Project: anrui-base(安瑞基础信息模块)
@@ -108,9 +109,9 @@ public interface BaseModelConfigFeign { @PostMapping("/getList") public ResultBean> getList(); - @ApiOperation("PC端根据车型sid查询简述配置信息下拉选") + @ApiOperation("PC端根据车型sid查询常用配置信息下拉选") @GetMapping("/getListByVeSid") - public ResultBean> getListByVeSid(@RequestParam("vehicleSid") String vehicleSid); + public ResultBean>> getListByVeSid(@RequestParam("modelSid") String modelSid); @ApiOperation("PC端根据简述配置sid查询简述配置信息") @GetMapping("/getByVeSid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java index 429de7d42b..525050e18d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: anrui-base(安瑞基础信息模块)
@@ -75,7 +76,7 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign { } @Override - public ResultBean> getListByVeSid(String vehicleSid) { + public ResultBean>> getListByVeSid(String vehicleSid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index aa1f1ab375..aad05df036 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -37,6 +38,9 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty("常用配置sid") private String modelConfigSid; + @ApiModelProperty("常用配置名称") + private String configName; + @ApiModelProperty("车架号(VIN)（陕汽必须的字段）") private String vinNo; @@ -49,9 +53,12 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty("车辆状态key值") private String vehicleState; - @ApiModelProperty("存放地点（陕汽必须的字段）") + @ApiModelProperty("存放地点sid（陕汽必须的字段）") private String location; + @ApiModelProperty("存放地点名称（陕汽必须的字段）") + private String locationName; + @ApiModelProperty("库龄（根据首次发车日期计算）（陕汽必须的字段）") private String libraryAge; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 66179e6d9d..fa15f58196 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; @@ -37,6 +38,9 @@ public class BaseVehicleDto implements Dto { private String vehicleStateValue; @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("常用配置名称") + @NotBlank(message = "常用配置不能为空") + private String configName; @ApiModelProperty("车型配置sid") private String modelConfigSid; @ApiModelProperty("特殊或差异说明") @@ -52,21 +56,29 @@ public class BaseVehicleDto implements Dto { @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家入库日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date priceDate; @ApiModelProperty("发车日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String departureDate; @ApiModelProperty("到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String arrivalDate; @ApiModelProperty("销售日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String salesDate; @ApiModelProperty(value = "买断日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date solidDate; @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）") private String settlementStatus; @ApiModelProperty("采购退库日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String returnDate; - @ApiModelProperty("存放地点（陕汽必须的字段）") + @ApiModelProperty("存放地点sid（陕汽必须的字段）") private String location; + @ApiModelProperty("存放地点名称（陕汽必须的字段）") + private String locationName; @ApiModelProperty(value = "厂家入库价") private float priced; @ApiModelProperty(value = "成交价") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java index ff92c03f0d..a28bcba7da 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java @@ -33,7 +33,7 @@ public class BaseVehicleQuery implements Query { @ApiModelProperty(value = "存放地点") private String location; - @ApiModelProperty(value = "车辆状态") + @ApiModelProperty(value = "库存状态") private String vehicleState; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index 6ba76d9647..baf856b00c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.api.basevehicle; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,6 +29,8 @@ public class BaseVehicleSelectVo implements Vo { private String vehicleStateValue; @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("常用配置名称") + private String configName; @ApiModelProperty("车型配置sid") private String modelConfigSid; @ApiModelProperty("特殊或差异说明") @@ -43,21 +46,29 @@ public class BaseVehicleSelectVo implements Vo { @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家入库日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date priceDate; @ApiModelProperty("发车日期") - private String departureDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date departureDate; @ApiModelProperty("到货日期") - private String arrivalDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date arrivalDate; @ApiModelProperty("销售日期") - private String salesDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date salesDate; @ApiModelProperty(value = "买断日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date solidDate; @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）") private String settlementStatus; @ApiModelProperty("采购退库日期") - private String returnDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date returnDate; @ApiModelProperty("存放地点（陕汽必须的字段）") private String location; + @ApiModelProperty("存放地点名称（陕汽必须的字段）") + private String locationName; @ApiModelProperty(value = "厂家入库价") private float priced; @ApiModelProperty(value = "成交价") @@ -69,7 +80,7 @@ public class BaseVehicleSelectVo implements Vo { @ApiModelProperty("锁定状态Value") private String lockedStateValue; @ApiModelProperty("创建组织sid(陕汽必须的字段)") - private String createOrg; + private String[][] createOrg; @ApiModelProperty("创建组织名称(陕汽必须的字段)") private String createOrgName; @ApiModelProperty("使用组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 822f23b007..2ae687d284 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -41,11 +41,12 @@ public class BaseVehicleVo implements Vo { @ApiModelProperty("车辆状态") private String vehicleStateValue; - @ApiModelProperty("存放地点") - private String location; + @ApiModelProperty("存放地点名称（陕汽必须的字段）") + private String locationName; @ApiModelProperty("库龄（根据首次发车日期计算）") private String libraryAge; - + @ApiModelProperty("车型配置sid") + private String modelConfigSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 1d1fe9593e..0431e936e3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java @@ -204,10 +204,10 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { } @Override - public ResultBean> getListByVeSid(String vehicleSid) { - ResultBean> rb = ResultBean.fireFail(); - List listVo = baseVehicleModelService.getListByVeSid(vehicleSid); - return rb.success().setData(listVo); + public ResultBean>> getListByVeSid(String vehicleSid) { + ResultBean>> rb = ResultBean.fireFail(); + List> listByVeSid = baseVehicleModelService.getListByVeSid(vehicleSid); + return rb.success().setData(listByVeSid); } @Override 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 43dfac9d39..bbbf61ff0e 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 @@ -7,7 +7,7 @@ SELECT count(*) FROM base_vehicle - WHERE vinNo = #{vinNo} + WHERE vinNo = #{vinNo} and isDelete = 0 AND sid <> #{sid} 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 898a3ae204..838688cf0a 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 @@ -99,7 +99,7 @@ public class BaseVehicleService extends MybatisBaseService + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java index c64212e271..89c7a0ab08 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java @@ -8,6 +8,7 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -105,11 +106,19 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign { BaseVehicleCertificate entity = new BaseVehicleCertificate(); dto.fillEntity(entity); List list = dto.getCertificatePhoto(); + if (list.size() == 0){ + return rb.setMsg("请上传合格证照片"); + } String certificatePhoto = ""; for (int i = 0; i < list.size(); i++) { certificatePhoto += list.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; } entity.setCertificatePhoto(certificatePhoto.substring(0, certificatePhoto.length()-1)); + String certificationNo = dto.getCertificationNo(); + int i1 = baseVehicleCertificateService.checkByCertificationNo(certificationNo); + if (i1 > 0){ + return rb.setMsg("该合格证编码已存在"); + } boolean isSave = baseVehicleCertificateService.save(entity); if (!isSave) { return rb.fail().setMsg("添加失败"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index 646b5ccaf8..12e26fcccc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -142,4 +142,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService { List getList(); - List getListByVeSid(String vehicleSid); + List> getListByVeSid(String vehicleSid); BaseVehicleModelSelectVo getAll(String sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index 2afd801d7f..c85e804068 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml @@ -205,14 +205,6 @@ where isDelete = 0 - @@ -431,4 +421,15 @@ and sid != #{sid} and isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 15bff83d7f..f2f886cb58 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -286,7 +286,7 @@ public class BaseVehicleModelService extends MybatisBaseService getListByVeSid(String vehicleSid) { + public List> getListByVeSid(String vehicleSid) { return baseMapper.getListByVeSid(vehicleSid); } @@ -336,6 +336,7 @@ public class BaseVehicleModelService extends MybatisBaseService> selectDownPlusByModelName(String modelName) { QueryWrapper> qw = new QueryWrapper<>(); + qw.eq("bvm.isDelete",0); if (StringUtils.isNotBlank(modelName)) { qw.like("bvm.modelName", modelName); }