Commit 81165497 by lijingjing

修改报告问题;

parent 63785439
...@@ -62,7 +62,6 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -62,7 +62,6 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Autowired @Autowired
private IEntrustReportTemplateConfigService entrustReportTemplateConfigService; private IEntrustReportTemplateConfigService entrustReportTemplateConfigService;
@Autowired @Autowired
private OssClient ossClient; private OssClient ossClient;
...@@ -363,8 +362,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -363,8 +362,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
e.printStackTrace(); e.printStackTrace();
} }
List<OriginalTemplateConfig> configList = originalTemplateConfigService.list(Condition.create().eq("template_id",templateId)); List<EntrustReportTemplateConfig> configList = entrustReportTemplateConfigService.list(Condition.create().eq("template_id", templateId));
OriginalUtil.doReplace(xssfWorkbook,entrust); OriginalUtil.doReplace(xssfWorkbook, entrust);
XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0); XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0);
String sheetName = sheetOne.getSheetName(); String sheetName = sheetOne.getSheetName();
System.out.println(sheetName); System.out.println(sheetName);
...@@ -372,33 +371,33 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -372,33 +371,33 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
Integer beginRow = sysFileTemplate.getSampleBeginRow(); Integer beginRow = sysFileTemplate.getSampleBeginRow();
int sampleMergerNum = sysFileTemplate.getSampleMergerNum(); int sampleMergerNum = sysFileTemplate.getSampleMergerNum();
int templateSampleNum = sysFileTemplate.getTemplateSampleNum(); int templateSampleNum = sysFileTemplate.getTemplateSampleNum();
if (templateSampleNum>=sampleVOList.size()){ if (templateSampleNum >= sampleVOList.size()) {
for (EntrustSampleVO vo:sampleVOList) { for (EntrustSampleVO vo : sampleVOList) {
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId()); List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
vo.setIndexList(indexList); vo.setIndexList(indexList);
XSSFRow xssfRow = sheetOne.getRow(beginRow); XSSFRow xssfRow = sheetOne.getRow(beginRow);
for (OriginalTemplateConfig config:configList) { for (EntrustReportTemplateConfig config : configList) {
XSSFCell cell = xssfRow.getCell(config.getColumnPlace()); XSSFCell cell = xssfRow.getCell(config.getColumnPlace());
if ("sn".equals(config.getDataAttribute())){ if ("sn".equals(config.getDataAttribute())) {
continue; continue;
} }
if (StringUtils.isBlank(config.getDataAttribute())){ if (StringUtils.isBlank(config.getDataAttribute())) {
continue; continue;
} }
String value= StringHandleUtils.getFieldValue(config.getDataAttribute(),vo); String value = StringHandleUtils.getFieldValue(config.getDataAttribute(), vo);
cell.setCellValue(value); cell.setCellValue(value);
} }
beginRow+=sampleMergerNum; beginRow += sampleMergerNum;
} }
String generated = entrust.getCode(); String generated = entrust.getCode();
FileOutputStream os = null; FileOutputStream os = null;
File file = null; File file = null;
try { try {
file = File.createTempFile(generated, ".docx"); file = File.createTempFile(generated, ".xlsx");
os = new FileOutputStream(file); os = new FileOutputStream(file);
xssfWorkbook.write(os); xssfWorkbook.write(os);
os.flush(); os.flush();
entrustReportService.uploadReportGenerateDocx(entrust,ids, account, StringHandleUtils.join(sampleNameSet),"报告生成", file); entrustReportService.uploadReportGenerateDocx(entrust, ids, account, StringHandleUtils.join(sampleNameSet), "报告生成", file);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
......
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