问题修改

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

@@ -1243,6 +1243,7 @@
         WHERE vinNo = #{vinNo}
           AND useOrgSid = #{useOrgSid}
           AND isDelete = 0
+          AND vehicleState != "0004"
     </select>
 
     <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">

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

@@ -166,10 +166,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             } else {
                 //厂家库龄
                 if (record.getPriceDate() != null) {
+                    //厂家入库日期
                     Date priceDate = record.getPriceDate();
-                    String settlementStatus = record.getSettlementStatus();
-                    if (settlementStatus.equals("2")) {
-                        Date solidDate = record.getSolidDate();
+                    //买断日期
+                    Date solidDate = record.getSolidDate();
+                    if (solidDate != null) {
                         int i = priceDate.compareTo(solidDate);
                         long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY);
                         record.setLibraryAge(betweenDay * i * -1);
@@ -186,6 +187,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (record.getDepartureDate() != null) {
                 //发车日期
                 Date departureDate = record.getDepartureDate();
+                //销售日期
                 Date salesDate = record.getSalesDate();
                 if (salesDate != null) {
                     int i = departureDate.compareTo(salesDate);
@@ -201,7 +203,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             }
             //买断库龄
             if (record.getSolidDate() != null) {
+                //买断日期
                 Date solidDate = record.getSolidDate();
+                //销售日期
                 Date salesDate = record.getSalesDate();
                 if (salesDate != null) {
                     int i = solidDate.compareTo(salesDate);

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

@@ -2439,7 +2439,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
         baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
         baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
-
         baseVehicle.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
         if (save(baseVehicle)) {