教师获奖登记导出调整

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

@@ -151,10 +151,14 @@ public class TeacherAwardController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             for (TeacherAwardDetailPageVo el : list) {
                 TeacherAwardDetailExcelVo rowData = BeanUtil.toBean(el, TeacherAwardDetailExcelVo.class);
-                if(el.getIssueDate() == null){
+                if(el.getAwardDate() == null && el.getIssueDate() == null){
                     rowData.setIssueDate("");
                 }else{
-                    rowData.setIssueDate(sdf.format(el.getIssueDate()));
+                    if(el.getIsThesis() == 1){
+                        rowData.setIssueDate(sdf.format(el.getAwardDate()));
+                    }else if(el.getIsThesis() == 0){
+                        rowData.setIssueDate(sdf.format(el.getIssueDate()));
+                    }
                 }
                 if(rowData.getRemark() == null){
                     rowData.setRemark("");