Skip to content

C
cloud-platform
Commit 35a10c0f authored by 周健威's avatar 周健威
Browse files
Options

修改合并bug

parent af25e38e
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 59 deletions
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml
View file @ 35a10c0f
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper"> <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper" >
<resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.VehicleUpkeepLog">
<!--
WARNING - @mbg.generated <select id="selectLastByVehicleId" resultType="com.xxfc.platform.vehicle.entity.VehicleDepartureLog">
--> select * from vehicle_departure_log
<id column="id" property="id" jdbcType="INTEGER"/> where vehicle_id = #{vehicleId}
<result column="vehicle_id" property="vehicleId" jdbcType="VARCHAR"/> order by create_time desc
<result column="operator" property="operator" jdbcType="VARCHAR"/> limit 1
<result column="date" property="date" jdbcType="TIMESTAMP"/> </select>
<result column="mileage" property="mileage" jdbcType="INTEGER"/> <select id="selectByVehicleId">
<result column="amount" property="amount" jdbcType="DECIMAL"/> select vehicle_departure_log.*,vehicle.number_plate
<result column="approvers" property="approvers" jdbcType="VARCHAR"/> from vehicle_departure_log
<result column="branch_company_id" property="branchCompanyId" jdbcType="INTEGER"/> left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> where vehicle_id = #{vehicleId}
</resultMap> order by create_time desc
<insert id="addItems"> </select>
insert into vehicle_upkeep_log_item(log_id, item_id) <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
values select vehicle_departure_log.*,vehicle.number_plate,
<trim suffixOverrides=","> /* IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/
<foreach collection="upkeepItems" item="item"> CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',
(#{id}, #{item}), IFNULL(floor(IF((unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))>86400,(unix_timestamp(vehicle_departure_log.arrival_time)
</foreach> - unix_timestamp(vehicle_departure_log.departure_time)) MOD 86400/3600,(unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))/3600)),0),'小时')
</trim> as departureDay,bc.name as departureName,bc1.name as arrivalName,
</insert> IF((IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0))>0,IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0),0) as mileage
<delete id="deleteItemsByLogId"> from vehicle_departure_log
delete from vehicle_upkeep_log_item left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
where log_id = #{id} LEFT JOIN branch_company bc ON vehicle_departure_log.departure_branch_company_id = bc.id
</delete> LEFT JOIN branch_company bc1 ON vehicle_departure_log.arrival_branch_company_id = bc1.id
<select id="selectVoAll" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo">
select a.*, b.number_plate, c.name as branch_company_name
from vehicle_upkeep_log a
left join vehicle b on a.vehicle_id = b.id
left join branch_company c on a.branch_company_id = c.id
<trim prefix="where"> <trim prefix="where">
1=1 1=1
<if test="numberPlate != null and numberPlate != ''"> <if test="numberPlate != null and numberPlate != ''">
and b.number_plate = #{numberPlate} and vehicle.number_plate = #{numberPlate}
</if> </if>
<if test="companyList != null and companyList.size() > 0"> <if test="time != null and time != ''">
and ( a.branch_company_id in ( and (vehicle_departure_log.arrival_time >= str_to_date(#{time}, '%Y-%m-%d %H')
<trim suffixOverrides=","> or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
or vehicle_departure_log.arrival_time is null
)
and
(
vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
or vehicle_departure_log.departure_time is null
)
</if>
</trim>
order by create_time desc
</select>
<select id="selectVoAllNotAllData" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
select vehicle_departure_log.*,vehicle.number_plate,
/*IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/
CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',
IFNULL(floor(IF((unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))>86400,(unix_timestamp(vehicle_departure_log.arrival_time)
- unix_timestamp(vehicle_departure_log.departure_time)) MOD 86400/3600,(unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))/3600)),0),'小时')
as departureDay,bc.name as departureName,bc1.name as arrivalName,
IF((IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0))>0,IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0),0) as mileage
from vehicle_departure_log
left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
LEFT JOIN branch_company bc ON vehicle_departure_log.departure_branch_company_id = bc.id
LEFT JOIN branch_company bc1 ON vehicle_departure_log.arrival_branch_company_id = bc1.id
<trim prefix="where" suffixOverrides="and">
<if test="numberPlate != null and numberPlate != ''">
vehicle.number_plate = #{numberPlate} and
</if>
<if test="companyList != null">
( vehicle_departure_log.departure_branch_company_id in (
<foreach collection="companyList" item="companyId"> <foreach collection="companyList" item="companyId">
<trim suffixOverrides=",">
#{companyId}, #{companyId},
</trim>
</foreach> </foreach>
)
or vehicle_departure_log.arrival_branch_company_id in (
<foreach collection="companyList" item="companyId">
<trim suffixOverrides=",">
#{companyId},
</trim> </trim>
</foreach>
) )
) )
</if> </if>
<if test="time != null and time != ''">
and (vehicle_departure_log.arrival_time >= str_to_date(#{time}, '%Y-%m-%d %H')
or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
or vehicle_departure_log.arrival_time is null
)
and
(
vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
or vehicle_departure_log.departure_time is null
)
</if>
</trim> </trim>
order by a.create_time desc order by create_time desc
</select>
<select id="selectVoById" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo">
select a.*, b.number_plate, c.name as branch_company_name
from vehicle_upkeep_log a
left join vehicle b on a.vehicle_id = b.id
left join branch_company c on a.branch_company_id = c.id
where a.id = #{id}
</select> </select>
<select id="getItemsByLogId" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo"> <select id="selectMileageByVehicleId" resultType="int">
select a.*, b.name as item_name select sum(mileage_end - mileage_start)
from vehicle_upkeep_log_item a from vehicle_departure_log
left join vehicle_upkeep_item b on a.item_id = b.id where vehicle_id = #{vehicleId};
where a.log_id = #{id}
</select> </select>
<select id="selectLastByVehicleId" resultType="com.xxfc.platform.vehicle.entity.VehicleUpkeepLog"> <select id="selectDayByVehicleId" resultType="String">
select * SELECT
from vehicle_upkeep_log CONCAT(IFNULL(floor(t.total_expire_minute / 86400),0),'天',IFNULL(floor(IF(t.total_expire_minute>86400,t.total_expire_minute MOD 86400/3600,
where vehicle_id = #{vehicleId} t.total_expire_minute/3600)),0),'小时')
order by create_time desc FROM
limit 1 (
SELECT
SUM(
unix_timestamp(arrival_time) - unix_timestamp(departure_time)
) AS total_expire_minute
FROM
vehicle_departure_log
WHERE
vehicle_id =#{vehicleId}
) t
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment