Commit 7c02aa53 authored by kevin's avatar kevin

Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql

parents 93233248 bc4a9981
......@@ -2602,7 +2602,7 @@ public class ReportServiceImpl extends BaseService {
ebitCellData1.setCreateTime(new Date());
ebitCellData1.setCol(k);
ebitCellData1.setRow(j);
ebitCellData1.setData(getCellStringValue(sheet.getRow(j).getCell(k)).equals("") == true ? "0" : getCellStringValue(sheet.getRow(j).getCell(k)));
ebitCellData1.setData(getCellStringValue(sheet.getRow(j).getCell(k)));
ebitCellDataList.add(ebitCellData1);
}//这里只保存两列{}
}
......@@ -2775,9 +2775,9 @@ public class ReportServiceImpl extends BaseService {
for (EbitCellData ebitCellData : entry.getValue()) {
if (m == ebitCellData.getRow()) {
try {
sheetAt.getRow(m).getCell(_index + 1).setCellValue(ebitCellData.getData());
sheetAt.getRow(m).getCell(_index + 1).setCellValue(ebitCellData.getData().equals("")== true ? "0" : ebitCellData.getData() );
} catch (Exception e) {
sheetAt.getRow(m).createCell(_index + 1).setCellValue(ebitCellData.getData());
sheetAt.getRow(m).createCell(_index + 1).setCellValue(ebitCellData.getData().equals("")== true ? "0" : ebitCellData.getData());
}
}
}
......
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