|
|
@@ -12,6 +12,7 @@ import cn.cslg.report.entity.Report;
|
|
|
import cn.cslg.report.entity.ReportFiles;
|
|
|
import cn.cslg.report.entity.asso.AssoReportFile;
|
|
|
import cn.cslg.report.mapper.ReportMapper;
|
|
|
+import cn.cslg.report.service.IProductService;
|
|
|
import cn.cslg.report.service.OutInterfaceService;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
@@ -53,6 +54,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
|
|
|
private final TaskService taskService;
|
|
|
private final FeatureService featureService;
|
|
|
private final CompareScenariosService compareScenariosService;
|
|
|
+ private final IProductService productService;
|
|
|
|
|
|
/**
|
|
|
* @param report 报告类
|
|
|
@@ -269,8 +271,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
|
|
|
//删除所有和报告有关的对比方案
|
|
|
compareScenariosService.deleteByReportId(id);
|
|
|
assoTaskPersonelService.deleAssoTaskPersonel(id);
|
|
|
- //陈宇 ↓ 删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的附件图片文件表数据
|
|
|
-// productService.deleteProduct(id);
|
|
|
+ //陈宇 ↓ 删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的报告系统文件表数据
|
|
|
+ productService.deleteProduct(id);
|
|
|
|
|
|
int dele = reportMapper.dele(id);
|
|
|
if (dele > 0) {
|
chendayu