From 25adcf0309fa6cc0b90b64148cb6869b5323d0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com> Date: Mon, 27 Apr 2026 16:36:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tyre/BaseTyreController.java | 5 ---- .../com/ruoyi/system/domain/BaseTyre.java | 1 + .../system/domain/BizMaintenanceOrder.java | 12 ++++++++ .../service/impl/BaseTyreServiceImpl.java | 29 +++++++++++++++++-- .../mapper/tyre/BizOrderTireDetailMapper.xml | 5 ++-- .../mapper/tyre/RecordTyreInstallMapper.xml | 2 +- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java index a9223211..6d94aa31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java +++ b/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() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java index 2b3b2074..da362ace 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java index e775ddbc..e75cf64d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java +++ b/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 bizOrderTireDetailList; + + public List getBizOrderTireDetailList() { + return bizOrderTireDetailList; + } + + public void setBizOrderTireDetailList(List bizOrderTireDetailList) { + this.bizOrderTireDetailList = bizOrderTireDetailList; + } + private String line; public String getLine() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java index b333b5ad..94fd42c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java +++ b/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 recordTyreInstallList = recordTyreInstallMapper.selectRecordTyreInstallList(recordTyreInstall); map.put("recordTyreInstallList",recordTyreInstallList); + //维修/保养 + //查询轮胎详细表 + BizOrderTireDetail bizOrderTireDetail = new BizOrderTireDetail(); + bizOrderTireDetail.setTireId(resultBase.getTyreId()); + List bizOrderTireDetailList = bizOrderTireDetailMapper.selectBizOrderTireDetailList(bizOrderTireDetail); + if (bizOrderTireDetailList!=null && bizOrderTireDetailList.size() > 0 ){ + for (BizOrderTireDetail biz : bizOrderTireDetailList){ + //查询维修单//筛选工单 + List 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; } } diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml index be6e165e..f494ec87 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml @@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"