Merge branch 'insp'

This commit is contained in:
xyc 2025-08-04 16:23:40 +08:00
commit ddb1f3c935

View File

@ -807,6 +807,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.startTime!=null and query.startTime!=''">
and ins.start_time between #{query.startTime} and #{query.endTime}
</if>
<if test="query.datetimeRange != null">
<if test="query.dateType != null and query.dateType.equals('jcTime')">
and ins.start_time between #{query.datetimeRange[0]} and #{query.datetimeRange[1]}
</if>
<if test="query.dateType != null and query.dateType.equals('bxTime')">
and car.insurance_expiry_date between #{query.datetimeRange[0]} and #{query.datetimeRange[1]}
</if>
<if test="query.dateType != null and query.dateType.equals('bxVehicleTime')">
and car.vehicle_insurance_expiry_date between #{query.datetimeRange[0]} and #{query.datetimeRange[1]}
</if>
<if test="query.dateType != null and query.dateType.equals('nextInspectionTime')">
and car.next_inspection_date between #{query.datetimeRange[0]} and #{query.datetimeRange[1]}
</if>
</if>
</select>
<select id="selectLatestByCarNums" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
SELECT ii.*,car.*