Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/domain/CarMaintenanceLifecycleDTO.java

@@ -27,10 +27,10 @@ public class CarMaintenanceLifecycleDTO implements Serializable
     /** 车牌号，工单中直接记录的车牌号，用于与车辆主档确认关联。 */
     private String plateNumber;
 
-    /** 维保类型编码，字典值，例如：一级保养、二级保养、小修、大修。 */
+    /** 维保类型编码 */
     private String typeCode;
 
-    /** 工单状态编码，字典值，例如：待派工、维修中、已完成、已结算。 */
+    /** 工单状态编码 */
     private String status;
 
     /** 录入里程，本次维保/保养时车辆的总行驶里程（数值型）。 */

ruoyi-system/src/main/resources/mapper/tyre/BaseCarLifecycleMapper.xml

@@ -39,8 +39,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bt.tyre_brand as tyreBrand,
                bt.tyre_model as tyreModel,
                bt.wheel_postion as wheelPostion,
-               bt.pattern_depth as patternDepth
+               maint.pattern_depth as patternDepth
         from base_tyre bt
+            left join (
+                select tyre_rfid, pattern_depth
+                from (
+                    select tyre_rfid, pattern_depth,
+                            row_number() over (partition by tyre_rfid order by create_time desc, id desc) as rn
+                    from record_tyre_mileage
+                    where record_type = '保养'
+                      and pattern_depth is not null
+                      and pattern_depth <> ''
+                ) ranked
+                where rn = 1
+            ) maint on maint.tyre_rfid = bt.tyre_epc
         where bt.car_no = #{carNo}
         order by bt.wheel_postion, bt.tyre_id
     </select>

ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="vehicleId != null "> and vehicle_id = #{vehicleId}</if>
-            <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and plate_number like concat('%', #{plateNumber}, '%')</if>
             <if test="typeCode == null  or typeCode == ''"> and type_code in ('1','4')</if>
             <if test="typeCode != null  and typeCode != ''"> and type_code = #{typeCode}</if>
             <if test="factoryId != null "> and factory_id = #{factoryId}</if>

ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml

@@ -29,10 +29,6 @@
     </sql>
 
     <select id="selectRecordTyreMileageList" parameterType="RecordTyreMileage" resultMap="RecordTyreMileageResult">
-        select rtm.id, rtm.tyre_rfid, rtm.start_time, rtm.end_time, rtm.mileage, rtm.mileage_old, rtm.pattern_depth, rtm.plate_number, rtm.record_id,
-        rtm.create_by, rtm.create_time, rtm.update_by, rtm.update_time, rtm.remark, bt.tyre_brand, bt.tyre_no
-        select rtm.id, rtm.tyre_rfid, rtm.start_time, rtm.end_time, rtm.mileage, rtm.mileage_old, rtm.pattern_depth,
-        rtm.create_by, rtm.create_time, rtm.update_by, rtm.update_time, rtm.remark,bt.tyre_brand,bt.tyre_no
         select rtm.id, rtm.tyre_rfid, rtm.start_time, rtm.end_time, rtm.mileage, rtm.pattern_depth,
         rtm.create_by, rtm.create_time, rtm.update_by, rtm.update_time, rtm.remark, rtm.plate_number, rtm.record_id, rtm.record_type, bt.tyre_brand, bt.tyre_no
         from record_tyre_mileage rtm