From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index d1786cb..f6ec4d6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -8,17 +8,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.mapper.ProductMapper;
-import com.ruoyi.basic.mapper.ProductPartMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.mapper.StructureTestObjectMapper;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.LaboratoryService;
import com.ruoyi.basic.service.ProductService;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
@@ -35,15 +34,13 @@
@Service
@AllArgsConstructor
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product>
- implements ProductService{
+ implements ProductService {
private ProductMapper productMapper;
private LaboratoryService laboratoryService;
private StructureTestObjectMapper structureTestObjectMapper;
-
- private ProductPartMapper productPartMapper;
private StandardProductListService standardProductListService;
@@ -122,10 +119,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int delProduct(Integer id) {
- // 鍒犻櫎闆朵欢缁戝畾
- productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
- .eq(ProductPart::getProductId, id));
-
return productMapper.deleteById(id);
}
@@ -185,4 +178,9 @@
}
});
}
+
+ @Override
+ public String getWordQrModel(Integer orderId) {
+ return baseMapper.getWordQrModel(orderId);
+ }
}
--
Gitblit v1.9.3