1、教师获奖登记导出字段调整

2、调课顶课申请字段类型调整

src/main/java/com/xjrsoft/module/schedule/entity/WfCourseAdjust.java

@@ -72,7 +72,7 @@ public class WfCourseAdjust implements Serializable {
     private String exchangeDate;
 
     @ApiModelProperty("替班教师id(xjr_user)")
-    private Long exchangeTeacherId;
+    private String exchangeTeacherId;
 
     @ApiModelProperty("对调课程id(base_course_subject)")
     private String exchangeCourseId;

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

@@ -32,12 +32,12 @@ public class TeacherAwardDetailExcelVo {
     @ApiModelProperty("作品名称")
     private String paperName;
 
-    @ExcelProperty("媒体名称")
-    @ApiModelProperty("媒体名称")
+    @ExcelProperty("刊文名称")
+    @ApiModelProperty("刊文名称")
     private String journalName;
 
-    @ExcelProperty("媒体类型")
-    @ApiModelProperty("媒体类型")
+    @ExcelProperty("刊文类型")
+    @ApiModelProperty("刊文类型")
     private String mediaType;
 
     @ExcelProperty("国内统一刊号")

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -64,6 +64,7 @@ import com.xjrsoft.module.workflow.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.log.Log;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.camunda.bpm.engine.HistoryService;
@@ -2237,9 +2238,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
         } catch (Exception e) {
             if (e.getMessage().contains("sequence flow")) {
+                Log.error(e.getMessage(), e);
                 throw new MyException("流转条件错误，请检查流转条件设置!");
             } else {
-
+                Log.error(e.getMessage(), e);
                 throw new MyException("表单提交错误， 请联系系统管理员!");
             }
         }