|
@@ -45,6 +45,7 @@ import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
|
import java.net.URL;
|
|
import java.net.URL;
|
|
|
import java.net.URLConnection;
|
|
import java.net.URLConnection;
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -142,8 +143,37 @@ public class TeacherAwardController {
|
|
|
int index = 1;
|
|
int index = 1;
|
|
|
Map<String, byte[]> byteAryMap = new HashMap<>();
|
|
Map<String, byte[]> byteAryMap = new HashMap<>();
|
|
|
String folderName = "附件材料";
|
|
String folderName = "附件材料";
|
|
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
for (TeacherAwardDetailPageVo el : list) {
|
|
for (TeacherAwardDetailPageVo el : list) {
|
|
|
TeacherAwardDetailExcelVo rowData = BeanUtil.toBean(el, TeacherAwardDetailExcelVo.class);
|
|
TeacherAwardDetailExcelVo rowData = BeanUtil.toBean(el, TeacherAwardDetailExcelVo.class);
|
|
|
|
|
+ if(el.getIssueDate() == null){
|
|
|
|
|
+ rowData.setIssueDate("");
|
|
|
|
|
+ }else{
|
|
|
|
|
+ rowData.setIssueDate(sdf.format(el.getIssueDate()));
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getRemark() == null){
|
|
|
|
|
+ rowData.setRemark("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getJournalLevel() == null){
|
|
|
|
|
+ rowData.setJournalLevel("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getJournalNumber() == null){
|
|
|
|
|
+ rowData.setJournalNumber("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getApplicantUserIdCn() == null){
|
|
|
|
|
+ rowData.setApplicantUserIdCn("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getIsThesis() == null){
|
|
|
|
|
+ rowData.setIsThesis("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getCompetitionName() == null){
|
|
|
|
|
+ rowData.setCompetitionName("");
|
|
|
|
|
+ }
|
|
|
|
|
+ if(rowData.getMediaType() == null){
|
|
|
|
|
+ rowData.setMediaType("");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
if(el.getIsThesis() == 1){
|
|
if(el.getIsThesis() == 1){
|
|
|
rowData.setIsThesis("是");
|
|
rowData.setIsThesis("是");
|
|
|
}else if(el.getIsThesis() == 0){
|
|
}else if(el.getIsThesis() == 0){
|