问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -138,4 +138,6 @@ public class BaseVehicle extends BaseEntity {
     private String witPinState;
     @ApiModelProperty(value = "调车状态value")
     private String witPinStateValue;
+    @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
+    private String isProblemVeh;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -104,4 +104,6 @@ public class BaseVehicleDto implements Dto {
     private String witPinState;
     @ApiModelProperty(value = "调车状态value")
     private String witPinStateValue;
+    @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
+    private String isProblemVeh;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@@ -93,4 +93,6 @@ public class BaseVehicleSelectVo implements Vo {
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
+    @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
+    private String isProblemVeh;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -104,4 +104,92 @@ public class BaseVehicleVo implements Vo {
     private String certificateStateValue;
     @ApiModelProperty(value = "库龄")
     private Long libraryAge;
+    @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
+    private String isProblemVeh;
+
+    //车型配置
+    @ApiModelProperty("车身颜色(陕汽必须的字段)")
+    private String carColor;
+    @ApiModelProperty("驾驶室规格(陕汽必须的字段)")
+    private String specification;
+    @ApiModelProperty("油箱/气罐(陕汽必须的字段)")
+    private String fuelTank;
+    @ApiModelProperty("导流罩(陕汽必须的字段)")
+    private String baffleModel;
+    @ApiModelProperty("独立热源（有、无）")
+    private String independentSources;
+    @ApiModelProperty("护轮罩（有、无）")
+    private String tireCover;
+    @ApiModelProperty("鞍座（陕汽必须的字段）")
+    private String saddle;
+    @ApiModelProperty("空调（陕汽必须的字段）")
+    private String airConditioner;
+    @ApiModelProperty("其他配置")
+    private String otherConfig;
+    @ApiModelProperty("后桥速比")
+    private String rearAxleRatio;
+    @ApiModelProperty("后桥value")
+    private String rearAxleValue;
+    @ApiModelProperty("轮胎规格")
+    private String tireSize;
+    @ApiModelProperty("缓速器")
+    private String slowMachine;
+    @ApiModelProperty("后视镜")
+    private String rearViewMirror;
+    @ApiModelProperty("轴距（重汽、欧曼）")
+    private String wheelbase;
+    @ApiModelProperty("悬架（重汽、欧曼）")
+    private String suspension;
+    @ApiModelProperty("货箱（重汽、欧曼）")
+    private String packingCase;
+    @ApiModelProperty("座椅（陕汽、欧曼）")
+    private String seat;
+    @ApiModelProperty("轮毂材质（重汽）")
+    private String hubMaterial;
+    @ApiModelProperty("配置包（陕汽）")
+    private String configuringBao;
+    @ApiModelProperty("多媒体（陕汽）")
+    private String multimedia;
+    @ApiModelProperty("保险杠（欧曼）")
+    private String bumper;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("配置编码")
+    private String configCode;
+
+    //车型
+    @ApiModelProperty("厂商(陕汽必须的字段)")
+    private String manufacturer;
+    @ApiModelProperty("车辆类型value值")
+    private String vehicleTypeValue;
+    @ApiModelProperty("产品线value值")
+    private String productLineValue;
+    @ApiModelProperty(value = "排放标准value值")
+    private String emissionStandardValue;
+    @ApiModelProperty(value = "驱动形式value值")
+    private String driveFormValue;
+    @ApiModelProperty(value = "马力value值")
+    private String powerValue;
+    @ApiModelProperty(value = "变速箱value值")
+    private String gearboxTypeValue;
+    @ApiModelProperty(value = "燃料种类value值")
+    private String fuelTypeValue;
+    @ApiModelProperty("车辆版本value值")
+    private String vehicleVersionValue;
+    @ApiModelProperty(value = "发动机型号value值")
+    private String engineTypeValue;
+    @ApiModelProperty(value = "规格型号（陕汽特有）")
+    private String specifications;
+    @ApiModelProperty(value = "系别（欧曼特有）")
+    private String department;
+    @ApiModelProperty(value = "系别Value（欧曼特有）")
+    private String departmentValue;
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
+    @ApiModelProperty(value = "公告型号")
+    private String announcementModel;
+    @ApiModelProperty(value = "细分市场")
+    private String marketSegmentsValue;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java

@@ -169,4 +169,5 @@ public class BaseVehicleCertificateDetailsVo implements Vo {
     private String locationSid; // 存放地点sid
     @ApiModelProperty("存放地点")
     private String location; // 存放地点
+
 }

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

@@ -448,4 +448,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue} where vinNo = #{vinNo}")
     void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("vinNo") String vinNo);
+
+    @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}")
+    void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid);
 }

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

@@ -26,6 +26,12 @@
         LEFT JOIN base_vehicle_certificate bvcf
         ON bv.`sid` = bvcf.`vehicleSid`
         AND bv.createOrgSid = bvcf.createOrgSid
+        LEFT JOIN base_model_config bmc
+        ON bv.`modelConfigSid` = bmc.`sid`
+        AND bv.`createOrgSid` = bmc.createOrgSId
+        LEFT JOIN base_vehicle_model bvm
+        ON bv.`modelSid` = bvm.`sid`
+        AND bv.`createOrgSid` = bvm.createOrg
         <where>
             ${ew.sqlSegment}
         </where>
@@ -514,9 +520,9 @@
           and bv.useOrgSid = #{orgSid}
           AND (
                 bv.vehicleStateValue = '库存'
-                or bv.vehicleStateValue = '在途'
-                or bv.vehicleStateValue = '调入'
-            )
+                        or bv.vehicleStateValue = '在途'
+                        or bv.vehicleStateValue = '调入'
+                )
     </select>
 
     <select id="selExistingCarPageList"
@@ -594,7 +600,7 @@
                   AND bv.lockedState = #{state}
                   and bv.useOrgSid = bvc.useOrgSid) AS nowCarNum,
                (select SUM(cast((cast(bo.platformNo as signed) -
-                                          IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
+                                 IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
                 from bus_vehicle_order bo
                              LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
                 where bo.useOrgSid = bvc.useOrgSid
@@ -604,7 +610,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.useOrgSid != #{useOrg}
         group by bvc.useOrgSid
-        HAVING LENGTH(bvc.useOrgSid)> 0
+        HAVING LENGTH (bvc.useOrgSid)> 0
     </select>
 
     <select id="getAppModelConfig"
@@ -892,11 +898,11 @@
           and bv.modelConfigSid = #{configSid}
           and bv.useOrgSid = #{orgSid}
           and bv.lockedState = #{state}
-         AND (
-        bv.vehicleStateValue = '库存'
-        or bv.vehicleStateValue = '在途'
-        or bv.vehicleStateValue = '调入'
-        )
+          AND (
+                bv.vehicleStateValue = '库存'
+                        or bv.vehicleStateValue = '在途'
+                        or bv.vehicleStateValue = '调入'
+                )
         order by isFictitious desc
     </select>
 
@@ -909,9 +915,9 @@
 
     <select id="getVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
         select vinNo as vin,
-               sid as carSid,
-               settlementStatus,
-               settlementStatusValue
+        sid as carSid,
+        settlementStatus,
+        settlementStatusValue
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}

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

@@ -2421,4 +2421,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return qw;
     }
+
+    public void updateVinNoByVehSid(String vinNo, String vehicleSid) {
+        baseMapper.updateVinNoByVehSid(vinNo,vehicleSid);
+    }
 }

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

@@ -154,6 +154,10 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
             }
         }
         int i = baseVehicleCertificateService.updateBySid(dto.toMap(), sid);
+        String vinNo = dto.getVinNo();
+        if (vinNo.length() == 17){
+            baseVehicleService.updateVinNoByVehSid(vinNo,baseVehicleCertificate.getVehicleSid());
+        }
         if (i == 0) {
             return rb.fail().setMsg("修改失败");
         }