问题修改

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(安瑞基础信息模块) <br/>
@@ -108,9 +109,9 @@ public interface BaseModelConfigFeign {
     @PostMapping("/getList")
     public ResultBean<List<BaseModelConfigVo>> getList();
 
-    @ApiOperation("PC端根据车型sid查询简述配置信息下拉选")
+    @ApiOperation("PC端根据车型sid查询常用配置信息下拉选")
     @GetMapping("/getListByVeSid")
-    public ResultBean<List<BaseModelConfigVo>> getListByVeSid(@RequestParam("vehicleSid") String vehicleSid);
+    public ResultBean<List<Map<String,String>>> getListByVeSid(@RequestParam("modelSid") String modelSid);
 
     @ApiOperation("PC端根据简述配置sid查询简述配置信息")
     @GetMapping("/getByVeSid")

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(安瑞基础信息模块) <br/>
@@ -75,7 +76,7 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
     }
 
     @Override
-    public ResultBean<List<BaseModelConfigVo>> getListByVeSid(String vehicleSid) {
+    public ResultBean<List<Map<String,String>>> getListByVeSid(String vehicleSid) {
         return null;
     }
 

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;
 

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 = "成交价")

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;
 
 }

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

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("存放地点")
+    @ApiModelProperty("存放地点名称（陕汽必须的字段）")
-    private String location;
+    private String locationName;
 
     @ApiModelProperty("库龄（根据首次发车日期计算）")
     private String libraryAge;
 
-
+    @ApiModelProperty("车型配置sid")
+    private String modelConfigSid;
 }

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<List<BaseModelConfigVo>> getListByVeSid(String vehicleSid) {
+    public ResultBean<List<Map<String,String>>> getListByVeSid(String vehicleSid) {
-        ResultBean<List<BaseModelConfigVo>> rb = ResultBean.fireFail();
+        ResultBean<List<Map<String,String>>> rb = ResultBean.fireFail();
-        List<BaseModelConfigVo> listVo = baseVehicleModelService.getListByVeSid(vehicleSid);
+        List<Map<String, String>> listByVeSid = baseVehicleModelService.getListByVeSid(vehicleSid);
-        return rb.success().setData(listVo);
+        return rb.success().setData(listByVeSid);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -7,7 +7,7 @@
     <select id="selectCountByVinNo" resultType="int">
         SELECT count(*)
         FROM base_vehicle
-        WHERE vinNo = #{vinNo}
+        WHERE vinNo = #{vinNo} and isDelete = 0
     </select>
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
@@ -16,8 +16,9 @@
         bv.vinNo,
         bv.engineNo,
         bv.vehicleStateValue,
-        bv.location,
+        bv.locationName,
-        bv.libraryAge
+        bv.libraryAge,
+        bv.modelConfigSid
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -27,7 +28,7 @@
     <select id="selectCountBySidAndVinNo" resultType="int">
         SELECT count(*)
         FROM base_vehicle
-        WHERE vinNo = #{vinNo}
+        WHERE vinNo = #{vinNo} and isDelete = 0
           AND sid &lt;&gt; #{sid}
     </select>
     <!--详情及修改回显-->

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<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
                 qw.like("bv.location", pagerQuery.getLocation());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//车辆状态
+            if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//库存状态
                 qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
             }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -85,4 +85,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     int updateBySidIsDelete(String sid);
 
     BaseVehicleCertificate selectByVehicleSid(String carSid);
+
+    int checkByCertificationNo(String certificationNo);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -173,4 +173,13 @@
         from base_vehicle_certificate
         where vehicleSid = #{carSid}
     </select>
+
+    <select id="checkByCertificationNo" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_vehicle_certificate
+        WHERE certificationNo = #{certificationNo}
+          AND isDelete = 0
+    </select>
 </mapper>

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<String> 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("添加失败");

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<BaseVehicl
     public BaseVehicleCertificate selectByVehicleSid(String carSid) {
         return baseMapper.selectByVehicleSid(carSid);
     }
+
+    public int checkByCertificationNo(String certificationNo) {
+        return baseMapper.checkByCertificationNo(certificationNo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -99,7 +99,7 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     List<BaseModelConfigVo> getList();
 
-    List<BaseModelConfigVo> getListByVeSid(String vehicleSid);
+    List<Map<String,String>> getListByVeSid(String vehicleSid);
 
     BaseVehicleModelSelectVo getAll(String sid);
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -205,14 +205,6 @@
         where isDelete = 0
     </select>
 
-    <select id="getListByVeSid" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo">
-        SELECT bmc.sid,
-        <!--简述配置名称-->
-        bmc.configName
-        FROM base_model_config bmc
-        where isDelete = 0
-        and bmc.vehicleSid = #{vehicleSid}
-    </select>
     <select id="getVehicleModelBySid"
             resultType="com.yxt.anrui.base.api.basevehiclemodel.AppVehicleModelBySidVo">
         SELECT bvm.carBrand   AS brandSid,
@@ -299,10 +291,8 @@
     </select>
 
     <select id="selectDownPlusByModelName" resultType="java.util.Map">
-        SELECT bvm.modelName, bvm.sid, bvc.`configurationItemsSid`
+        SELECT bvm.modelName, bvm.sid
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehmodel_config bvc
-                ON bvm.`sid` = bvc.`modelSid`
                 ${ew.customSqlSegment}
     </select>
 
@@ -431,4 +421,15 @@
           and sid != #{sid}
           and isDelete = 0
     </select>
+
+    <select id="getListByVeSid" resultType="java.util.Map">
+        SELECT
+                bmc.sid,
+                bmc.`configName`
+        FROM
+                base_model_config bmc
+                        LEFT JOIN base_vehmodel_config bvc
+                        ON bmc.sid = bvc.`configurationItemsSid`
+        WHERE bvc.`modelSid` = #{vehicleSid}
+    </select>
 </mapper>

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<BaseVehicleModel
         return baseMapper.getList();
     }
 
-    public List<BaseModelConfigVo> getListByVeSid(String vehicleSid) {
+    public List<Map<String,String>> getListByVeSid(String vehicleSid) {
         return baseMapper.getListByVeSid(vehicleSid);
     }
 
@@ -336,6 +336,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
 
     public List<Map<String, Object>> selectDownPlusByModelName(String modelName) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        qw.eq("bvm.isDelete",0);
         if (StringUtils.isNotBlank(modelName)) {
             qw.like("bvm.modelName", modelName);
         }