Merge branch 'master' of http://1.13.177.47:3000/Yangwl/SZXBGJ_HT

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java

ruoyi-admin/src/main/resources/templates/tyre/tyre/typreDetill2.html

@@ -178,6 +178,11 @@
             background: #ed5565;
         }
 
+        .life-item.is-maintenance .life-dot {
+            border-color: #fde6c8;
+            background: #f8ac59;
+        }
+
         .life-title-row {
             display: flex;
             justify-content: space-between;
@@ -210,6 +215,33 @@
             color: #8a6d3b;
         }
 
+        .tire-detail-list {
+            grid-column: 1 / -1;
+            margin-top: 8px;
+            padding: 8px 10px;
+            background: #fbfbfb;
+            border: 1px solid #edf1f2;
+            border-radius: 4px;
+        }
+
+        .tire-detail-title {
+            margin-bottom: 6px;
+            color: #2f4050;
+            font-weight: 600;
+        }
+
+        .tire-detail-row {
+            display: grid;
+            grid-template-columns: repeat(4, minmax(0, 1fr));
+            gap: 6px 10px;
+            padding: 7px 0;
+            border-top: 1px dashed #e7eaec;
+        }
+
+        .tire-detail-row:first-of-type {
+            border-top: 0;
+        }
+
         .empty-life {
             padding: 48px 16px;
             color: #999;
@@ -227,7 +259,8 @@
             }
 
             .info-grid,
-            .life-meta {
+            .life-meta,
+            .tire-detail-row {
                 grid-template-columns: repeat(2, minmax(0, 1fr));
             }
 
@@ -245,7 +278,9 @@
 <div class="detail-shell"
      th:with="resultBase=${resultMap['resultBase']},
               recordWarehousingList=${resultMap['recordWarehousingList']},
-              recordTyreInstallList=${resultMap['recordTyreInstallList']}">
+              recordTyreInstallList=${resultMap['recordTyreInstallList']},
+              bizMaintenanceOrder=${resultMap['bizMaintenanceOrder']},
+              bizOrderTireDetailList=${resultMap['bizMaintenanceOrder'] == null ? null : resultMap['bizMaintenanceOrder'].bizOrderTireDetailList}">
     <div class="summary-panel">
         <div class="summary-main">
             <div>
@@ -339,6 +374,8 @@
         <div class="life-summary">
             <span class="life-count" th:text="${'出入库记录：' + (#lists.isEmpty(recordWarehousingList) ? 0 : #lists.size(recordWarehousingList))}">出入库记录：0</span>
             <span class="life-count" th:text="${'装卸车记录：' + (#lists.isEmpty(recordTyreInstallList) ? 0 : #lists.size(recordTyreInstallList))}">装卸车记录：0</span>
+            <span class="life-count" th:text="${'维保工单：' + (bizMaintenanceOrder == null ? 0 : 1)}">维保工单：0</span>
+            <span class="life-count" th:if="${bizMaintenanceOrder != null}" th:text="${'维保轮胎明细：' + (#lists.isEmpty(bizOrderTireDetailList) ? 0 : #lists.size(bizOrderTireDetailList))}">维保轮胎明细：0</span>
         </div>
 
         <div class="life-section" th:if="${!#lists.isEmpty(recordWarehousingList)}">
@@ -385,7 +422,66 @@
             </ul>
         </div>
 
-        <div class="empty-life" th:if="${#lists.isEmpty(recordWarehousingList) and #lists.isEmpty(recordTyreInstallList)}">
+        <div class="life-section" th:if="${bizMaintenanceOrder != null}">
+            <div class="life-section-title">维保工单</div>
+            <ul class="life-list">
+                <li class="life-item is-maintenance">
+                    <span class="life-dot"></span>
+                    <div class="life-title-row">
+                        <div class="life-title">
+                            <span th:switch="${bizMaintenanceOrder.typeCode}">
+                                <span th:case="'1'">二级保养</span>
+                                <span th:case="'2'">抢碎修</span>
+                                <span th:case="'3'">拆报废车</span>
+                                <span th:case="'4'">月检</span>
+                                <span th:case="'5'">小修</span>
+                                <span th:case="*" th:text="${#strings.isEmpty(bizMaintenanceOrder.typeCode) ? '维保工单' : bizMaintenanceOrder.typeCode}">维保工单</span>
+                            </span>
+                            <span th:if="${!#strings.isEmpty(bizMaintenanceOrder.orderNo)}" th:text="${'：' + bizMaintenanceOrder.orderNo}">：-</span>
+                        </div>
+                        <div class="life-time" th:text="${bizMaintenanceOrder.maintainDate == null ? '-' : #dates.format(bizMaintenanceOrder.maintainDate, 'yyyy-MM-dd')}">-</div>
+                    </div>
+                    <div class="life-meta">
+                        <div th:text="${#strings.isEmpty(bizMaintenanceOrder.orderNo) ? '工单号：-' : '工单号：' + bizMaintenanceOrder.orderNo}">工单号：-</div>
+                        <div>
+                            <span>状态：</span>
+                            <span th:switch="${bizMaintenanceOrder.status}">
+                                <span th:case="'UNSTARTED'">未开始</span>
+                                <span th:case="'PROCESSING'">执行中</span>
+                                <span th:case="'COMPLETED'">已完成</span>
+                                <span th:case="*" th:text="${#strings.isEmpty(bizMaintenanceOrder.status) ? '-' : bizMaintenanceOrder.status}">-</span>
+                            </span>
+                        </div>
+                        <div th:text="${#strings.isEmpty(bizMaintenanceOrder.plateNumber) ? '车牌号码：-' : '车牌号码：' + bizMaintenanceOrder.plateNumber}">车牌号码：-</div>
+                        <div th:text="${#strings.isEmpty(bizMaintenanceOrder.factoryName) ? '维修站点：-' : '维修站点：' + bizMaintenanceOrder.factoryName}">维修站点：-</div>
+                        <div th:text="${bizMaintenanceOrder.inputMileage == null ? '当前车辆里程：-' : '当前车辆里程：' + bizMaintenanceOrder.inputMileage + ' km'}">当前车辆里程：-</div>
+                        <div th:text="${bizMaintenanceOrder.lastMileage == null ? '上次维保里程：-' : '上次维保里程：' + bizMaintenanceOrder.lastMileage + ' km'}">上次维保里程：-</div>
+                        <div th:text="${bizMaintenanceOrder.createTime == null ? '创建时间：-' : '创建时间：' + #dates.format(bizMaintenanceOrder.createTime, 'yyyy-MM-dd HH:mm:ss')}">创建时间：-</div>
+                        <div th:text="${bizMaintenanceOrder.updateTime == null ? '完成时间：-' : '完成时间：' + #dates.format(bizMaintenanceOrder.updateTime, 'yyyy-MM-dd HH:mm:ss')}">完成时间：-</div>
+                        <div th:text="${#strings.isEmpty(bizMaintenanceOrder.createBy) ? '创建人：-' : '创建人：' + bizMaintenanceOrder.createBy}">创建人：-</div>
+                        <div th:text="${#strings.isEmpty(bizMaintenanceOrder.updateBy) ? '完成操作人：-' : '完成操作人：' + bizMaintenanceOrder.updateBy}">完成操作人：-</div>
+                        <div class="life-remark" th:if="${!#strings.isEmpty(bizMaintenanceOrder.description)}" th:text="${'补充说明：' + bizMaintenanceOrder.description}">补充说明：-</div>
+                        <div class="life-remark" th:if="${!#strings.isEmpty(bizMaintenanceOrder.remark)}" th:text="${'备注：' + bizMaintenanceOrder.remark}">备注：-</div>
+
+                        <div class="tire-detail-list" th:if="${!#lists.isEmpty(bizOrderTireDetailList)}">
+                            <div class="tire-detail-title">轮胎执行明细</div>
+                            <div class="tire-detail-row" th:each="detail : ${bizOrderTireDetailList}">
+                                <div th:text="${#strings.isEmpty(detail.dataType) ? '动作：-' : '动作：' + detail.dataType}">动作：-</div>
+                                <div th:text="${#strings.isEmpty(detail.positionName) ? '轮位：-' : '轮位：' + detail.positionName}">轮位：-</div>
+                                <div th:text="${#strings.isEmpty(detail.tireCode) ? '轮胎编号：-' : '轮胎编号：' + detail.tireCode}">轮胎编号：-</div>
+                                <div th:text="${detail.treadDepth == null ? '花纹深度：-' : '花纹深度：' + detail.treadDepth + ' mm'}">花纹深度：-</div>
+                                <div th:text="${detail.tirePress == null ? '胎压：-' : '胎压：' + detail.tirePress}">胎压：-</div>
+                                <div th:text="${#strings.isEmpty(detail.tireStatus) ? '轮胎状态：-' : '轮胎状态：' + detail.tireStatus}">轮胎状态：-</div>
+                                <div th:text="${detail.createTime == null ? '明细创建时间：-' : '明细创建时间：' + #dates.format(detail.createTime, 'yyyy-MM-dd HH:mm:ss')}">明细创建时间：-</div>
+                                <div th:text="${#strings.isEmpty(detail.remark) ? '明细备注：-' : '明细备注：' + detail.remark}">明细备注：-</div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+
+        <div class="empty-life" th:if="${#lists.isEmpty(recordWarehousingList) and #lists.isEmpty(recordTyreInstallList) and bizMaintenanceOrder == null}">
             暂无生命周期记录
         </div>
     </div>