From 22970e4d13015b92fbfbd3a2d43414e4c3a33950 Mon Sep 17 00:00:00 2001
From: uu <1197651512@qq.com>
Date: Sat, 22 Jun 2024 01:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E4=BB=BB=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E6=94=B9=E9=9D=A9?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../easy/admin/activiti/model/ActivitiTask.java    |  9 +++++++++
 .../modules/huzhou/dao/mapping/WorkflowMapper.xml  | 14 +++++++-------
 .../modules/huzhou/entity/WorkflowBaseInfo.java    |  1 +
 .../huzhou/service/impl/WorkflowServiceImpl.java   |  1 +
 4 files changed, 18 insertions(+), 7 deletions(-)

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