diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java index 63d085e7..6be1c80c 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java @@ -66,6 +66,6 @@ public interface ProductInfoMapper List listByProductCodeList(@Param("list") List productCodeList); - ProductInfo query(MaintenanceRecordsDto dto); + List query(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java index c117478a..65b8a08d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java @@ -62,5 +62,5 @@ public interface IProductInfoService */ public int deleteProductInfoById(Long id); - ProductInfo query(MaintenanceRecordsDto dto); + List query(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index e2906ead..2dcb5c56 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -134,6 +134,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override public List selectOrderInfoByMaintenance(MaintenanceRecordsDto dto) { + if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){ + dto.setSerialNumber("-23232$$$$32"); + } return orderInfoMapper.selectOrderInfoByMaintenance(dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java index 76b31c87..5bfbda85 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.sip.service.impl; import java.util.List; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.sip.domain.MaintenanceRecordsDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,7 +96,10 @@ public class ProductInfoServiceImpl implements IProductInfoService } @Override - public ProductInfo query(MaintenanceRecordsDto dto) { + public List query(MaintenanceRecordsDto dto) { + if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){ + dto.setSerialNumber("-23232$$$$32"); + } return productInfoMapper.query(dto); } }