feat: 修复统计

wlzboy

5 天以前 fe33646ee6e2d1e57f2b51812e94983a0e9efb04

 ruoyi-system/src/main/resources/mapper/system/VehicleMileageStatsMapper.xml

@@ -77,25 +77,26 @@
                 s.data_source, s.create_time, s.update_time, vd.dept_id
    </select>

    <!-- 根据车辆ID和统计日期查询唯一统计记录 -->
    <select id="selectByVehicleIdAndDate" resultMap="VehicleMileageStatsResult">
        <include refid="selectVehicleMileageStatsVo"/>
        where s.vehicle_id = #{vehicleId} and s.stat_date = #{statDate}
        group by s.stats_id, s.vehicle_id, s.vehicle_no, s.stat_date, s.total_mileage, s.task_mileage,
                 s.non_task_mileage, s.task_ratio, s.gps_point_count, s.task_count, s.segment_count,
                 s.data_source, s.create_time, s.update_time, vd.dept_id
        select s.stats_id, s.vehicle_id, s.vehicle_no, s.stat_date, s.total_mileage, s.task_mileage, 
               s.non_task_mileage, s.task_ratio, s.gps_point_count, s.task_count, s.segment_count, 
               s.data_source, s.create_time, s.update_time
        from tb_vehicle_mileage_stats s
        where s.vehicle_id = #{vehicleId} and DATE(s.stat_date) = DATE(#{statDate})
        limit 1
    </select>

    <select id="selectTaskTimeIntervals" resultMap="TaskTimeIntervalResult">
        select tv.task_id, t.create_time as start_time, 
        select tv.task_id, t.actual_start_time as start_time,
               IFNULL(t.actual_end_time, NOW()) as end_time
        from sys_task_vehicle tv
        inner join sys_task t on tv.task_id = t.task_id
        where tv.vehicle_id = #{vehicleId}
          and t.del_flag = '0'
          and t.actual_end_time is not null
          and t.create_time &lt; #{endTime}
          and t.actual_end_time &gt; #{startTime}
        order by t.create_time
          and (t.actual_start_time &lt;= #{endTime} and (t.actual_end_time is null or t.actual_end_time &gt;= #{startTime}))

        order by t.actual_start_time
    </select>
        
    <insert id="insertVehicleMileageStats" parameterType="VehicleMileageStats" useGeneratedKeys="true" keyProperty="statsId">
@@ -128,6 +129,17 @@
            <if test="dataSource != null">#{dataSource},</if>
            NOW()
         </trim>
        ON DUPLICATE KEY UPDATE
            vehicle_no = VALUES(vehicle_no),
            total_mileage = VALUES(total_mileage),
            task_mileage = VALUES(task_mileage),
            non_task_mileage = VALUES(non_task_mileage),
            task_ratio = VALUES(task_ratio),
            gps_point_count = VALUES(gps_point_count),
            task_count = VALUES(task_count),
            segment_count = VALUES(segment_count),
            data_source = VALUES(data_source),
            update_time = NOW()
    </insert>

    <update id="updateVehicleMileageStats" parameterType="VehicleMileageStats">