123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -180,9 +180,8 @@ public class VehicleActiveService {
                     return stringBuilder.toString();
                 }
             }
-        } else {
-            stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         }
+        stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         return stringBuilder.toString();
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -373,7 +373,7 @@
 
     </select>
     <select id="selectByVehicleId" parameterType="java.lang.String"
-            resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+            resultMap="searchBookRecord">
        SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
                LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2