diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java index 6c42eb1dd5..4a0e30f907 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java @@ -19,6 +19,7 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + import lombok.Data; @@ -31,76 +32,86 @@ import lombok.Data; @Data public class ProjectProcessDTO implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 唯一标识 - */ + /** + * 唯一标识 + */ private String id; - /** - * 项目ID - */ + /** + * 项目ID + */ private String projectId; - /** - * 负负责人ID - */ + /** + * 部门名 + */ + private String departmentName; + + /** + * 负负责人ID + */ private String staffId; - /** - * 处理:结案close,退回return,部门流转transfer,创建项目created - */ + /** + * 处理:结案close,退回return,部门流转transfer,创建项目created + */ private String operation; - /** - * 公开答复 - */ + /** + * 处理名 + */ + private String operationName; + + /** + * 公开答复 + */ private String publicReply; - /** - * 内部备注 - */ + /** + * 内部备注 + */ private String internalRemark; - /** - * 结束时间 - */ + /** + * 结束时间 + */ private Date endTime; - /** - * 耗费天数 - */ + /** + * 耗费天数 + */ private String costWorkdays; - /** - * 删除标识:0.未删除 1.已删除 - */ + /** + * 删除标识:0.未删除 1.已删除 + */ private String delFlag; - /** - * 乐观锁 - */ + /** + * 乐观锁 + */ private Integer revision; - /** - * 创建人 - */ + /** + * 创建人 + */ private String createdBy; - /** - * 创建时间 - */ + /** + * 创建时间 + */ private Date createdTime; - /** - * 更新人 - */ + /** + * 更新人 + */ private String updatedBy; - /** - * 更新时间 - */ + /** + * 更新时间 + */ private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java index 9072cfbb3d..ea0ef88350 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java @@ -78,6 +78,11 @@ public class ProjectStaffDTO implements Serializable { */ private String staffId; + /** + * 部门名 + */ + private String departmentName; + /** * 是否处理:未处理unhandle,已处理handle */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java index 68f06bb6eb..0890e5dec8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java @@ -48,6 +48,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity { */ private String processId; + /** + * 部门名 + */ + private String departmentName; + /** * 负负责人ID */ @@ -58,6 +63,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity { */ private String operation; + /** + * 处理名 + */ + private String operationName; + /** * 公开答复 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java index a971380628..dc8e798090 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java @@ -73,6 +73,11 @@ public class ProjectStaffEntity extends BaseEpmetEntity { */ private String staffId; + /** + * 部门名 + */ + private String departmentName; + /** * 是否处理:未处理unhandle,已处理handle */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java index a60f113441..263745f2bf 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java @@ -37,12 +37,18 @@ public class ProjectProcessExcel { @Excel(name = "项目ID") private String projectId; + @Excel(name = "部门名") + private String departmentName; + @Excel(name = "负负责人ID") private String staffId; @Excel(name = "处理:结案close,退回return,部门流转transfer,创建项目created") private String operation; + @Excel(name = "处理名") + private String operationName; + @Excel(name = "公开答复") private String publicReply; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java index bfa228dd25..d9e54ca24b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java @@ -58,6 +58,9 @@ public class ProjectStaffExcel { @Excel(name = "人员ID") private String staffId; + @Excel(name = "部门名") + private String departmentName; + @Excel(name = "是否处理:未处理unhandle,已处理handle") private String isHandle;