966120Api.git - Gitblit

			@@ -4,46 +4,57 @@
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.ruoyi.system.mapper.VehicleInfoMapper">

			<resultMap type="VehicleInfo" id="VehicleInfoResult">
			<result property="vehicleId" column="vehicle_id" />
			<result property="deviceId" column="device_id" />
			<result property="vehicleNo" column="vehicle_no" />
			<result property="vehicleType" column="vehicle_type" />
			<result property="vehicleBrand" column="vehicle_brand" />
			<result property="vehicleModel" column="vehicle_model" />
			<result property="status" column="status" />
			<result property="createBy" column="create_by" />
			<result property="createTime" column="create_time" />
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="remark" column="remark" />
			<resultMap type="com.ruoyi.system.domain.VehicleInfo" id="VehicleInfoResult">
			<id property="vehicleId" column="vehicle_id" />
			<result property="deviceId" column="device_id" />
			<result property="vehicleNo" column="vehicle_no" />
			<result property="vehicleType" column="vehicle_type" />
			<result property="vehicleBrand" column="vehicle_brand" />
			<result property="vehicleModel" column="vehicle_model" />
			<result property="status" column="status" />
			<result property="platformCode" column="platform_code" />
			<result property="deptId" column="dept_id" />
			<result property="deptName" column="dept_name" />
			<result property="createBy" column="create_by" />
			<result property="createTime" column="create_time" />
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="remark" column="remark" />
			</resultMap>

			<sql id="selectVehicleInfoVo">
			select vehicle_id, device_id, vehicle_no, vehicle_type, vehicle_brand, vehicle_model, status, create_by, create_time, update_by, update_time, remark
			from tb_vehicle_info
			select v.vehicle_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand, v.vehicle_model, v.status, v.platform_code, v.dept_id, d.dept_name, v.create_by, v.create_time, v.update_by, v.update_time, v.remark
			from tb_vehicle_info v
			left join sys_dept d on v.dept_id = d.dept_id
			</sql>

			<select id="selectVehicleInfoList" parameterType="VehicleInfo" resultMap="VehicleInfoResult">
			<include refid="selectVehicleInfoVo"/>
			<where>
			<if test="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
			<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
			<if test="vehicleType != null and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
			<if test="vehicleBrand != null and vehicleBrand != ''"> and vehicle_brand = #{vehicleBrand}</if>
			<if test="vehicleModel != null and vehicleModel != ''"> and vehicle_model = #{vehicleModel}</if>
			<if test="status != null and status != ''"> and status = #{status}</if>
			<if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no = #{vehicleNo}</if>
			<if test="deviceId != null and deviceId != ''"> and v.device_id = #{deviceId}</if>
			<if test="vehicleType != null and vehicleType != ''"> and v.vehicle_type = #{vehicleType}</if>
			<if test="vehicleBrand != null and vehicleBrand != ''"> and v.vehicle_brand = #{vehicleBrand}</if>
			<if test="vehicleModel != null and vehicleModel != ''"> and v.vehicle_model = #{vehicleModel}</if>
			<if test="status != null and status != ''"> and v.status = #{status}</if>
			<if test="platformCode != null and platformCode != ''"> and v.platform_code = #{platformCode}</if>
			<if test="deptId != null"> and v.dept_id = #{deptId}</if>
			</where>
			</select>

			<select id="selectVehicleInfoById" parameterType="Long" resultMap="VehicleInfoResult">
			<include refid="selectVehicleInfoVo"/>
			where vehicle_id = #{vehicleId}
			where v.vehicle_id = #{vehicleId}
			</select>

			<select id="selectVehicleInfoByPlateNumber" parameterType="String" resultMap="VehicleInfoResult">
			<include refid="selectVehicleInfoVo"/>
			where vehicle_no = #{plateNumber}
			where v.vehicle_no = #{plateNumber}
			</select>

			<select id="selectVehicleInfoByVehicleNo" parameterType="String" resultMap="VehicleInfoResult">
			<include refid="selectVehicleInfoVo"/>
			where v.vehicle_no = #{vehicleNo}
			</select>

			<insert id="insertVehicleInfo" parameterType="VehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">
			@@ -55,6 +66,8 @@
			<if test="vehicleBrand != null">vehicle_brand,</if>
			<if test="vehicleModel != null">vehicle_model,</if>
			<if test="status != null">status,</if>
			<if test="platformCode != null">platform_code,</if>
			<if test="deptId != null">dept_id,</if>
			<if test="createBy != null">create_by,</if>
			<if test="createTime != null">create_time,</if>
			<if test="updateBy != null">update_by,</if>
			@@ -68,6 +81,8 @@
			<if test="vehicleBrand != null">#{vehicleBrand},</if>
			<if test="vehicleModel != null">#{vehicleModel},</if>
			<if test="status != null">#{status},</if>
			<if test="platformCode != null">#{platformCode},</if>
			<if test="deptId != null">#{deptId},</if>
			<if test="createBy != null">#{createBy},</if>
			<if test="createTime != null">#{createTime},</if>
			<if test="updateBy != null">#{updateBy},</if>
			@@ -85,8 +100,11 @@
			<if test="vehicleBrand != null">vehicle_brand = #{vehicleBrand},</if>
			<if test="vehicleModel != null">vehicle_model = #{vehicleModel},</if>
			<if test="status != null">status = #{status},</if>
			<if test="platformCode != null">platform_code = #{platformCode},</if>
			<if test="deptId != null">dept_id = #{deptId},</if>
			<if test="updateBy != null">update_by = #{updateBy},</if>
			update_time = sysdate()
			<if test="updateTime != null">update_time = #{updateTime},</if>
			<if test="remark != null">remark = #{remark},</if>
			</trim>
			where vehicle_id = #{vehicleId}
			</update>