修改2

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java

@@ -63,11 +63,6 @@ public class BaseTyreController extends BaseController
 
     @Autowired
     private IBaseInventoryService baseInventoryService;
-
-    @Autowired
-    private IBizOrderTireDetailService bizOrderTireDetailService;
-    @Autowired
-    private IBizMaintenanceOrderService iBizMaintenanceOrderService;
     @RequiresPermissions("tyre:tyre:view")
     @GetMapping()
     public String tyre()

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

@@ -58,6 +58,7 @@ public class BaseTyre extends BaseEntity
     private String patternDepth;
     @Excel(name = "轮胎沟槽数")
     private String grooves;
+    private String pressure;
     /** 轮胎类别 */
     @Excel(name = "轮胎类别")
     private String tyreType;

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

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -79,6 +81,16 @@ public class BizMaintenanceOrder extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
+    private List<BizOrderTireDetail> bizOrderTireDetailList;
+
+    public List<BizOrderTireDetail> getBizOrderTireDetailList() {
+        return bizOrderTireDetailList;
+    }
+
+    public void setBizOrderTireDetailList(List<BizOrderTireDetail> bizOrderTireDetailList) {
+        this.bizOrderTireDetailList = bizOrderTireDetailList;
+    }
+
     private String line;
 
     public String getLine() {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java

@@ -8,11 +8,11 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.BaseCar;
-import com.ruoyi.system.domain.BaseTyre;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.BaseTyreVo;
-import com.ruoyi.system.mapper.BaseTyreMapper;
+import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.IBaseTyreService;
+import com.sun.jna.platform.mac.SystemB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.utils.ShiroUtils.getLoginName;
 
@@ -44,6 +45,12 @@ public class BaseTyreServiceImpl implements IBaseTyreService
 
     @Autowired
     private RecordTyreInstallMapper recordTyreInstallMapper;
+
+    @Autowired
+    private BizOrderTireDetailMapper bizOrderTireDetailMapper;
+    @Autowired
+    private BizMaintenanceOrderMapper bizMaintenanceOrderMapper;
+
     private static final Logger log = LoggerFactory.getLogger(BaseTyreServiceImpl.class);
     /**
      * 查询轮胎基础信息
@@ -273,6 +280,22 @@ public class BaseTyreServiceImpl implements IBaseTyreService
             recordTyreInstall.setTyreRfid(tyreRfid);
             List<RecordTyreInstall> recordTyreInstallList = recordTyreInstallMapper.selectRecordTyreInstallList(recordTyreInstall);
             map.put("recordTyreInstallList",recordTyreInstallList);
+            //维修/保养
+            //查询轮胎详细表
+            BizOrderTireDetail bizOrderTireDetail = new BizOrderTireDetail();
+            bizOrderTireDetail.setTireId(resultBase.getTyreId());
+            List<BizOrderTireDetail> bizOrderTireDetailList = bizOrderTireDetailMapper.selectBizOrderTireDetailList(bizOrderTireDetail);
+            if (bizOrderTireDetailList!=null && bizOrderTireDetailList.size() > 0 ){
+                for (BizOrderTireDetail biz : bizOrderTireDetailList){
+                    //查询维修单//筛选工单
+                    List<BizOrderTireDetail> filteredList = bizOrderTireDetailList.stream()
+                            .filter(detail -> detail.getOrderId() == biz.getOrderId()) // 假设 orderId 是 int 类型
+                            .collect(Collectors.toList());
+                    BizMaintenanceOrder  bizMaintenanceOrder = bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(biz.getOrderId());
+                    bizMaintenanceOrder.setBizOrderTireDetailList(filteredList);
+                    map.put("bizMaintenanceOrder",bizMaintenanceOrder);
+                }
+            }
             return map;
         }
     }

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

@@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBizOrderTireDetailList" parameterType="BizOrderTireDetail" resultMap="BizOrderTireDetailResult">
         select botd.detail_id, botd.order_id, botd.position_id, botd.tire_id, botd.tire_code, botd.tread_depth,
-        botd.tire_press, botd.tire_status, botd.create_by, botd.create_time, botd.update_by, botd.update_time, botd.remark,
+        botd.tire_press, botd.tire_status, su.user_name as create_by, botd.create_time, botd.update_by, botd.update_time, botd.remark,
         sda.dict_label as position_name
         from biz_order_tire_detail botd
-        LEFT JOIN sys_dict_data sda ON sda.dict_value = botd.position_id
+        LEFT JOIN sys_dict_data sda ON sda.dict_code = botd.position_id
+        LEFT JOIN sys_user su ON su.login_name = botd.create_by
         <where>
             <if test="orderId != null "> and botd.order_id = #{orderId}</if>
             <if test="positionId != null "> and botd.position_id = #{positionId}</if>

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wheelPostion"    column="wheel_postion"    />
         <result property="tyreModel"    column="tyre_model"    />
         <result property="team"    column="team"    />
-        <result property="patternDepth"    column="patter_depth"    />
+        <result property="patternDepth"    column="pattern_depth"    />
         <result property="company"    column="company"    />
         <result property="carTeam"    column="carTeam"    />
     </resultMap>