Commit 15731d2b authored by neo's avatar neo

[bugfix] add project and preirod

parent 99c01c41
......@@ -417,6 +417,8 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
cellDataSource.setDataSourceId(dataSource.getId());
cellDataSource.setCreateTime(createTime);
cellDataSource.setUpdateTime(createTime);
cellDataSource.setPeriod(period);
cellDataSource.setProjectId(projectId);
SpringContextUtil.periodCellDataSourceMapper.insertSelective(cellDataSource);
}
}
......
......@@ -880,7 +880,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
for (PeriodCellData cellData : cellDataList) {
if (cellData.getId() != data.getCellId() && cellData.getFormulaExp().contains(cellName)) {
PeriodCellDataSourceExample cellDataSourceExample = new PeriodCellDataSourceExample();
cellDataSourceExample.createCriteria().andCellDataIdEqualTo(cellData.getId()).andCellTemplateIdEqualTo(cellData.getCellTemplateId());
cellDataSourceExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(cellData.getPeriod()).andCellDataIdEqualTo(cellData.getId()).andCellTemplateIdEqualTo(cellData.getCellTemplateId());
List<PeriodCellDataSource> cellDataSourceList = periodCellDataSourceMapper.selectByExample(cellDataSourceExample);
for (PeriodCellDataSource cellDataSource : cellDataSourceList) {
Long dataSourceId = cellDataSource.getDataSourceId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment