diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/model/ActivitiTask.java b/easy-activiti/src/main/java/com/easy/admin/activiti/model/ActivitiTask.java index aa90492..de61195 100644 --- a/easy-activiti/src/main/java/com/easy/admin/activiti/model/ActivitiTask.java +++ b/easy-activiti/src/main/java/com/easy/admin/activiti/model/ActivitiTask.java @@ -126,6 +126,15 @@ public class ActivitiTask { */ private String avatar; + private String reformName; + + public String getReformName() { + return reformName; + } + + public void setReformName(String reformName) { + this.reformName = reformName; + } public int getRevision() { return revision; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml index 728dca8..b5bf07a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml @@ -15,18 +15,18 @@ ) a \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkflowBaseInfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkflowBaseInfo.java index 0ae2fda..d9b847e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkflowBaseInfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkflowBaseInfo.java @@ -12,6 +12,7 @@ public class WorkflowBaseInfo { private String taskName; private String taskId; private String projectId; + private String reformName; @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") @JSONField(format="yyyy-MM-dd") private Date createDate; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java index cfdfd9b..333fd39 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java @@ -403,6 +403,7 @@ public class WorkflowServiceImpl implements IWorkflowService { WorkflowBaseInfo project = processinfoService.getProjectByInstid(processInstanceId); if(project!=null){ item.setBusinessTitle(project.getProjectName()); + item.setReformName(project.getReformName()); } }); page.setRecords(select);