diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java index 66051fb2..f95e03d3 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java @@ -36,7 +36,7 @@ public class HistoryDetailDTO { @ApiModelProperty(value = "执行ID") private String executionId; - @ApiModelProperty(value = "受理人") + @ApiModelProperty(value = "受理人id") private String assignee; @ApiModelProperty(value = "开始时间") @@ -50,4 +50,7 @@ public class HistoryDetailDTO { @ApiModelProperty(value = "审批意见") private String comment; + + @ApiModelProperty(value = "受理人姓名") + private String assigneeName; } diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java b/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java index 4e78910b..4716e91e 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java @@ -9,7 +9,7 @@ import java.util.Date; * @author Jone */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) public class HistoryDetailEntity { private static final long serialVersionUID = 1L; @@ -37,4 +37,6 @@ public class HistoryDetailEntity { private String comment; + private String assigneeName; + } diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml index e41e4f87..4e7ef980 100644 --- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml +++ b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml @@ -56,13 +56,28 @@ \ No newline at end of file