Merge branch 'pre'

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -243,11 +243,9 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
 //            return "已经评价，请勿重复评价";
 //        }
 
-        if(dto.getSubmitType() != null && dto.getSubmitType() == 2){
-            //评价结果保存
-            String delSql = "DELETE FROM evaluate_result WHERE submit_record_id = '" + mobileResultPageVo.getEvaluateSubmitRecordId() + "'";
-            SqlRunnerAdapter.db().delete(delSql);
-        }
+        //评价结果保存
+        String delSql = "DELETE FROM evaluate_result WHERE submit_record_id = '" + mobileResultPageVo.getEvaluateSubmitRecordId() + "'";
+        SqlRunnerAdapter.db().delete(delSql);
 
         List<AddEvaluateResultDto> resultList = dto.getResultList();
         for (AddEvaluateResultDto addEvaluateResultDto : resultList) {

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,13 +149,23 @@ 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.getIssueDate() == null){
-                    rowData.setIssueDate("");
-                }else{
-                    rowData.setIssueDate(sdf.format(el.getIssueDate()));
+                if(el.getIsThesis() == 1){
+                    if(el.getIssueDate() == null){
+                        rowData.setIssueDate("");
+                    }else{
+                        rowData.setIssueDate(sdf.format(el.getIssueDate()));
+                    }
+
+                }else if(el.getIsThesis() == 0){
+                    if(el.getAwardDate() == null){
+                        rowData.setIssueDate("");
+                    }else{
+                        rowData.setIssueDate(el.getAwardDate().format(dtf));
+                    }
                 }
                 if(rowData.getRemark() == null){
                     rowData.setRemark("");
@@ -171,8 +182,8 @@ public class TeacherAwardController {
                 if(rowData.getIsThesis() == null){
                     rowData.setIsThesis("");
                 }
-                if(rowData.getCompetitionName() == null){
-                    rowData.setCompetitionName("");
+                if(rowData.getWholeCompetitionName() == null){
+                    rowData.setWholeCompetitionName("");
                 }
                 if(rowData.getMediaType() == null){
                     rowData.setMediaType("");
@@ -181,7 +192,6 @@ public class TeacherAwardController {
                     rowData.setTeacherAwardItemScore("");
                 }
 
-
                 if(el.getIsThesis() == 1){
                     rowData.setIsThesis("是");
                 }else if(el.getIsThesis() == 0){

src/main/java/com/xjrsoft/module/teacher/entity/TeacherAward.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.teacher.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -175,4 +176,7 @@ public class TeacherAward implements Serializable {
 
     @ApiModelProperty("获奖日期")
     private LocalDate awardDate;
+
+    @ApiModelProperty("赛事名称")
+    private String eventName;
 }

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailExcelVo.java

@@ -22,7 +22,7 @@ public class TeacherAwardDetailExcelVo {
 
     @ExcelProperty("奖项名称")
     @ApiModelProperty("奖项名称")
-    private String competitionName;
+    private String wholeCompetitionName;
 
     @ExcelProperty("是否论文")
     @ApiModelProperty("是否论文")
@@ -48,6 +48,10 @@ public class TeacherAwardDetailExcelVo {
     @ApiModelProperty("期刊级别（核心期刊、一般期刊、(校级、内部论文)）")
     private String journalLevel;
 
+    @ExcelProperty("赛事名称")
+    @ApiModelProperty("赛事名称")
+    private String eventName;
+
     @ExcelProperty("发表/获奖时间")
     @ApiModelProperty("发表时间")
     private String issueDate;

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -132,4 +132,7 @@ public class TeacherAwardDetailPageVo {
 
     @ApiModelProperty("奖项分数")
     private String teacherAwardItemScore;
+
+    @ApiModelProperty("赛事名称")
+    private String eventName;
 }