Merge branch 'dev-excel0521' into dev-to-user-1

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/ProjectWorkflowRes.java

@@ -44,6 +44,10 @@ public class ProjectWorkflowRes {
      */
     private String viewField;
 
+    /**
+     * 几何信息矢量
+     */
+    private String geom;
 
 }
 

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -66,14 +66,19 @@
 
     <select id="selectCycleByProjectId" parameterType="string"
             resultType="com.siwei.apply.domain.res.ProjectWorkflowRes">
-        SELECT project_id      as projectId,
-               node_id         as nodeId,
-               workflow_id     as workflowId,
-               node_table_name as nodeTableName,
-               created_at      as createdAt
-        FROM t_project_workflow
-        WHERE project_id = #{projectId}
-        ORDER BY created_at
+        SELECT pw.project_id      as projectId,
+               pw.node_id         as nodeId,
+               pw.workflow_id     as workflowId,
+               pw.node_table_name as nodeTableName,
+               pw.created_at      as createdAt,
+               (SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
+                FROM t_node_land nl
+                         LEFT JOIN t_geom_db_details gd ON nl.geom_db_id = gd.upload_id
+                WHERE nl.node_id = pw.node_id
+                  AND gd.geom IS NOT NULL) as geom
+        FROM t_project_workflow  pw
+        WHERE pw.project_id = #{projectId}
+        ORDER BY pw.created_at
     </select>
 
     <select id="isOnchain" parameterType="map" resultType="boolean">