diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index b5da093..d8a6284 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -7,7 +7,6 @@ import com.adc.da.report.constant.ReportConstants; import com.adc.da.report.dao.mysql.FileDao; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.ReportLabelDao; -import com.adc.da.report.dao.mysql.ReportUserDao; import com.adc.da.report.eo.*; import com.adc.da.report.service.*; import com.adc.da.report.util.*; @@ -68,9 +67,6 @@ public class IReportServiceImpl extends ServiceImpl @Resource private ReportDao reportDao; - @Resource - private ReportUserDao reportUserDao; - @Resource private ReportLabelDao reportLabelDao; @@ -174,6 +170,7 @@ public class IReportServiceImpl extends ServiceImpl */ @Override @Transactional(rollbackFor = Exception.class) + @Deprecated public String insert(ReportEntity entity, List labelList, List reportPreviewUserIdList, List reportPreviewAndDownloadUserIdList) throws IOException { @@ -236,10 +233,10 @@ public class IReportServiceImpl extends ServiceImpl }); } else { - entity.setUpdateDate(format.format(new Date())); - reportDao.updateById(entity); - reportUserDao.delete(new QueryWrapper() - .eq("reportId", entity.getId())); +// entity.setUpdateDate(format.format(new Date())); +// reportDao.updateById(entity); +// reportUserDao.delete(new QueryWrapper() +// .eq("reportId", entity.getId())); //修改报表标签关系表(先删后增) iReportLabelService.deleteReportLabelByReportId(new String[]{entity.getId()}); @@ -540,9 +537,9 @@ public class IReportServiceImpl extends ServiceImpl c.setFileSize(StringUtils.isNotEmpty(fileEntity.getFileSize()) ? String.valueOf(Integer.parseInt(fileEntity.getFileSize()) / 1024) + "kb" : "0kb"); c.setFileName(fileEntity.getFileName()); - List userIdList = reportUserDao.selectList( - new QueryWrapper().eq("reportId", c.getId())) - .stream().map(ReportUserEntity::getUserId).collect(Collectors.toList()); +// List userIdList = reportUserDao.selectList( +// new QueryWrapper().eq("reportId", c.getId())) +// .stream().map(ReportUserEntity::getUserId).collect(Collectors.toList()); }); return list; } @@ -623,9 +620,9 @@ public class IReportServiceImpl extends ServiceImpl c.setFileSize(StringUtils.isNotEmpty(fileEntity.getFileSize()) ? String.valueOf(Integer.parseInt(fileEntity.getFileSize()) / 1024) + "kb" : "0kb"); c.setFileName(fileEntity.getFileName()); - List userIdList = reportUserDao.selectList( - new QueryWrapper().eq("reportId", c.getId())) - .stream().map(ReportUserEntity::getUserId).collect(Collectors.toList()); +// List userIdList = reportUserDao.selectList( +// new QueryWrapper().eq("reportId", c.getId())) +// .stream().map(ReportUserEntity::getUserId).collect(Collectors.toList()); }); return list; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 51fa0ed..cb7feca 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -28,7 +28,6 @@