教师获奖登记导出调整

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -48,6 +48,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -148,16 +149,22 @@ public class TeacherAwardController {
             int index = 1;
             Map<String, byte[]> byteAryMap = new HashMap<>();
             String folderName = "附件材料";
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             for (TeacherAwardDetailPageVo el : list) {
                 TeacherAwardDetailExcelVo rowData = BeanUtil.toBean(el, TeacherAwardDetailExcelVo.class);
-                if(el.getAwardDate() == null && el.getIssueDate() == null){
-                    rowData.setIssueDate("");
-                }else{
-                    if(el.getIsThesis() == 1){
+                if(el.getIsThesis() == 1){
+                    if(el.getIssueDate() == null){
+                        rowData.setIssueDate("");
+                    }else{
                         rowData.setIssueDate(sdf.format(el.getIssueDate()));
-                    }else if(el.getIsThesis() == 0){
-                        rowData.setIssueDate(sdf.format(el.getAwardDate()));
+                    }
+
+                }else if(el.getIsThesis() == 0){
+                    if(el.getAwardDate() == null){
+                        rowData.setIssueDate("");
+                    }else{
+                        rowData.setIssueDate(el.getAwardDate().format(dtf));
                     }
                 }
                 if(rowData.getRemark() == null){