待签任务分页增加所属改革任务字段显示

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;
     }

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml

@@ -15,18 +15,18 @@
         ) a
     </select>
     <select id="getProjectInfo" resultType="com.easy.admin.modules.huzhou.entity.WorkflowBaseInfo" parameterType="String">
-        SELECT project_Name,create_date,stage FROM `huzhou_projectinfo` WHERE id = #{projectId}
+        SELECT project_Name,reform_name,create_date,stage FROM `huzhou_projectinfo` WHERE id = #{projectId}
         UNION ALL
-        SELECT task_name project_Name,create_date,null from huzhou_planinfo WHERE id = #{projectId}
+        SELECT task_name project_Name,null,create_date,null from huzhou_planinfo WHERE id = #{projectId}
         union all
         SELECT
-            (select field_name from huzhou_changefieldmanage c where c.field_value =f.field_value) project_Name
-            ,create_date,null from huzhou_fieldchangehistory f WHERE id = #{projectId}
+            (select field_name from huzhou_changefieldmanage c where c.field_value =f.field_value) project_Name,
+            null,create_date,null from huzhou_fieldchangehistory f WHERE id = #{projectId}
         union all
-        SELECT project_Name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = #{projectId}
+        SELECT project_Name,reform_name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = #{projectId}
         union all
-        SELECT project_Name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = (select DISTINCT projectid from  huzhou_fieldchangehistory where group_id = #{projectId})
+        SELECT project_Name,reform_name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = (select DISTINCT projectid from  huzhou_fieldchangehistory where group_id = #{projectId})
         union all
-        SELECT project_Name,create_date,stage FROM `huzhou_projectinfo` WHERE id = (select DISTINCT projectid from  huzhou_fieldchangehistory where group_id = #{projectId})
+        SELECT project_Name,reform_name,create_date,stage FROM `huzhou_projectinfo` WHERE id = (select DISTINCT projectid from  huzhou_fieldchangehistory where group_id = #{projectId})
     </select>
 </mapper>

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;

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);