Skip to content

R
research-project
Commit 3659d90c by “Kongxiangkun”
Options

投票明细导出字段顺序调整

parent e399d7db
Showing with 17 additions and 11 deletions
cloud-research-service/src/main/java/com/yizhi/research/application/download/DownloadResearchDetails.java
...@@ -164,8 +164,10 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -164,8 +164,10 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
cell = row.createCell((short) 1); cell = row.createCell((short) 1);
cell.setCellValue("姓名"); cell.setCellValue("姓名");
cell = row.createCell((short) 2); cell = row.createCell((short) 2);
cell.setCellValue("是否完成"); cell.setCellValue("所在部门");
cell = row.createCell((short) 3); cell = row.createCell((short) 3);
cell.setCellValue("是否完成");
cell = row.createCell((short) 4);
cell.setCellValue("提交时间"); cell.setCellValue("提交时间");
...@@ -215,8 +217,8 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -215,8 +217,8 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
} }
} }
cell = row.createCell((short) cellSize + 1); // cell = row.createCell((short) cellSize + 1);
cell.setCellValue("所在部门"); // cell.setCellValue("所在部门");
// 在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制short, // 在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制short,
// 创建第1行 // 创建第1行
...@@ -276,12 +278,16 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -276,12 +278,16 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
cell.setCellValue(groupViewVo.getAccountFullName()); cell.setCellValue(groupViewVo.getAccountFullName());
} }
cell = row.createCell((short) 2); cell = row.createCell((short) 2);
if (groupViewVo.getOrgName() != null) {
cell.setCellValue(groupViewVo.getOrgName());
}
cell = row.createCell((short) 3);
if (groupViewVo.getJoinState() == 1) { if (groupViewVo.getJoinState() == 1) {
cell.setCellValue("是"); cell.setCellValue("是");
} else { } else {
cell.setCellValue("否"); cell.setCellValue("否");
} }
cell = row.createCell((short) 3); cell = row.createCell((short) 4);
if (groupViewVo.getFinishTime() != null) { if (groupViewVo.getFinishTime() != null) {
cell.setCellValue(format.format(groupViewVo.getFinishTime())); cell.setCellValue(format.format(groupViewVo.getFinishTime()));
} else { } else {
...@@ -458,13 +464,13 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -458,13 +464,13 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
} }
} }
//给部门名称赋值 //给部门名称赋值
int location1 = cellSize + 1; // int location1 = cellSize + 1;
if (groupViewVo.getOrgName() != null) { // if (groupViewVo.getOrgName() != null) {
cell = row.createCell((short) location1); // cell = row.createCell((short) location1);
cell.setCellValue(groupViewVo.getOrgName()); // cell.setCellValue(groupViewVo.getOrgName());
} else { // } else {
row.createCell((short) location1); // row.createCell((short) location1);
} // }
s++; s++;
// taskDetail(taskContext.getTaskId(), research.getName() + "导出数据第" + s + "行成功"); // taskDetail(taskContext.getTaskId(), research.getName() + "导出数据第" + s + "行成功");
......
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