|
@@ -11,6 +11,7 @@ import cn.cslg.pas.common.utils.ThrowException;
|
|
|
import cn.cslg.pas.domain.Product;
|
|
|
import cn.cslg.pas.domain.ProductMarketData;
|
|
|
import cn.cslg.pas.domain.Structure;
|
|
|
+import cn.cslg.pas.domain.Task;
|
|
|
import cn.cslg.pas.domain.asso.AssoProductPatent;
|
|
|
import cn.cslg.pas.domain.asso.AssoProductPicture;
|
|
|
import cn.cslg.pas.domain.asso.AssoStructurePatent;
|
|
@@ -21,10 +22,7 @@ import cn.cslg.pas.mapper.asso.AssoProductPictureMapper;
|
|
|
import cn.cslg.pas.mapper.ProductMapper;
|
|
|
import cn.cslg.pas.mapper.asso.AssoProductPatentMapper;
|
|
|
import cn.cslg.pas.mapper.asso.AssoStructurePatentMapper;
|
|
|
-import cn.cslg.pas.service.IAssoStructurePictureService;
|
|
|
-import cn.cslg.pas.service.IProductMarketDataService;
|
|
|
-import cn.cslg.pas.service.IProductService;
|
|
|
-import cn.cslg.pas.service.IStructureService;
|
|
|
+import cn.cslg.pas.service.*;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -59,9 +57,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
|
|
|
private final IStructureService structureService;
|
|
|
private final IAssoStructurePictureService assoStructurePictureService;
|
|
|
private final IProductMarketDataService productMarketDataService;
|
|
|
+ private final TaskService taskService;
|
|
|
private final CacheUtils cacheUtils;
|
|
|
private final LoginUtils loginUtils;
|
|
|
private final FileUtils fileUtils;
|
|
|
+
|
|
|
/**
|
|
|
* 新增产品
|
|
|
*
|
|
@@ -331,6 +331,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
|
|
|
log.info("产品的营销数据表删除数据");
|
|
|
productMarketDataService.remove(wrapper2);
|
|
|
|
|
|
+ //删除产品的所有任务
|
|
|
+ taskService.remove(new LambdaQueryWrapper<Task>().eq(Task::getProductId, id));
|
|
|
+
|
|
|
//删除产品数据
|
|
|
log.info("产品表删除数据");
|
|
|
int rows = productMapper.deleteById(id);
|