修复修改者与修改时间导出位置

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/nis/domain/configuration/TaskInfo.java b/src/main/java/com/nis/domain/configuration/TaskInfo.java
index e703f69..a51188b 100644
--- a/src/main/java/com/nis/domain/configuration/TaskInfo.java
+++ b/src/main/java/com/nis/domain/configuration/TaskInfo.java
@@ -26,8 +26,8 @@ public class TaskInfo extends BaseEntity<TaskInfo> {
 	private Integer creatorId;
 	@ExcelField(title="create_time",sort=8)
 	private Date createTime;
-	@ExcelField(title="editor",sort=9)
 	private Integer editorId;
+	@ExcelField(title="edit_time",sort=10)
 	private Date editTime;
 	private Integer auditorId;
 	@ExcelField(title="audit_time",sort=12)
@@ -35,7 +35,7 @@ public class TaskInfo extends BaseEntity<TaskInfo> {
 	//自定义 创建人员 修改人员 审核人员
 	@ExcelField(title="creator",sort=7)
     private String creatorName;
-	@ExcelField(title="edit_time",sort=10)
+	@ExcelField(title="editor",sort=9)
     private String editorName;
 	@ExcelField(title="auditor",sort=11)
     private String auditorName;
diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
index f3a13c6..69f7e66 100644
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -175,11 +176,12 @@ public class TaskInfoController extends BaseController{
 			classMap.put(entity.getMenuNameCode(), TaskInfo.class);
 			Field[] fields=TaskInfo.class.getDeclaredFields();
 			StringBuffer column=new StringBuffer();
+			Properties props=  this.getMsgProp();
 			for(Field f: fields) {
 				ExcelField ex=f.getAnnotation(ExcelField.class);
 				if(ex!=null) {
 					String title=ex.title();
-					if(entity.getColumns().indexOf(title)==-1) {
+					if(entity.getColumns().indexOf(props.getProperty(title, title))==-1) {
 						column.append(","+title);
 					}
 				}