流程添加名称

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/ProjectWorkflow.java

@@ -35,6 +35,10 @@ public class ProjectWorkflow {
      * 节点表名
      */
     private String nodeTableName;
+    /**
+     * 对应的流程名称
+     */
+    private String workflowName;
 
     /**
      * 创建时间

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java

@@ -51,3 +51,4 @@ public interface TdgyMapper {
      */
     List<ProjectSupplyRes> countAndSumByGdType();
 }
+

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/Gyjsydjfwscdjmpl.java

@@ -68,6 +68,7 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
         projectWorkflow.setProjectId(gyjsydjfwscdj.getProjectId());
         projectWorkflow.setNodeId(gyjsydjfwscdj.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return gyjsydjfwscdj.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/GyjsydscdjImpl.java

@@ -69,6 +69,7 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
         projectWorkflow.setProjectId(gyjsydscdj.getProjectId());
         projectWorkflow.setNodeId(gyjsydscdj.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return gyjsydscdj.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsgcghxkImpl.java

@@ -69,6 +69,7 @@ public class JsgcghxkImpl implements JsgcghxkService {
         projectWorkflow.setProjectId(jsgcghxk.getProjectId());
         projectWorkflow.setNodeId(jsgcghxk.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getTableName());
         projectWorkflowMapper.add(projectWorkflow);
         return jsgcghxk.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsydghxkImpl.java

@@ -66,6 +66,7 @@ public class JsydghxkImpl implements JsydghxkService {
         projectWorkflow.setProjectId(jsydghxk.getProjectId());
         projectWorkflow.setNodeId(jsydghxk.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return jsydghxk.getId();
     }
@@ -76,7 +77,7 @@ public class JsydghxkImpl implements JsydghxkService {
         Project project = projectMapper.get(projectId);
 
         JsydghxkRes jsydghxkRes = new JsydghxkRes();
-        if(jsydghxk != null){
+        if (jsydghxk != null) {
             BeanUtils.copyProperties(jsydghxk, jsydghxkRes);
         }
         jsydghxkRes.setProjectId(projectId);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -94,7 +94,7 @@ public class ProjectImpl implements ProjectService {
         List<ProjectSupplyRes> projectSupplyList = tdgyMapper.countAndSumByGdType();
         projectOverviewRes.setProjectSupplyList(projectSupplyList);
         // 获取项目进度
-        return null;
+        return projectOverviewRes;
     }
 }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -76,6 +76,7 @@ public class TdgyImpl implements TdgyService {
         projectWorkflow.setProjectId(tdgy.getProjectId());
         projectWorkflow.setNodeId(tdgy.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return tdgy.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdhyhsImpl.java

@@ -68,6 +68,7 @@ public class TdhyhsImpl implements TdhyhsService {
         projectWorkflow.setProjectId(tdhyhs.getProjectId());
         projectWorkflow.setNodeId(tdhyhs.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return tdhyhs.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TjyydhxImpl.java

@@ -56,6 +56,7 @@ public class TjyydhxImpl implements TjyydhxService {
         projectWorkflow.setProjectId(tjyydhx.getProjectId());
         projectWorkflow.setNodeId(tjyydhx.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return tjyydhx.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpImpl.java

@@ -72,6 +72,7 @@ public class YdbpImpl implements YdbpService {
         projectWorkflow.setProjectId(ydbp.getProjectId());
         projectWorkflow.setNodeId(ydbp.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return ydbp.getId();
     }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdysyxzImpl.java

@@ -57,6 +57,7 @@ public class YdysyxzImpl implements YdysyxzService {
         projectWorkflow.setProjectId(ydysyxz.getProjectId());
         projectWorkflow.setNodeId(ydysyxz.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return ydysyxz.getId();
     }

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

@@ -8,19 +8,20 @@
         <result property="parentId" column="parent_id"/>
         <result property="nodeId" column="node_id"/>
         <result property="nodeTableName" column="node_table_name"/>
+        <result property="workflowName" column="workflow_name"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
 
     <select id="selectByProjectId" parameterType="string" resultMap="ProjectWorkflowResultMap">
-        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, created_at, updated_at
+        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, workflow_name, created_at, updated_at
         FROM t_project_workflow
         WHERE project_id = #{projectId}
         ORDER BY created_at
     </select>
 
     <select id="selectByNodeId" parameterType="string" resultMap="ProjectWorkflowResultMap">
-        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, created_at, updated_at
+        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, workflow_name, created_at, updated_at
         FROM t_project_workflow
         WHERE node_id = #{nodeId}
         ORDER BY created_at
@@ -28,14 +29,14 @@
 
     <insert id="add" parameterType="com.siwei.apply.domain.ProjectWorkflow">
         INSERT INTO t_project_workflow (
-            id, project_id, workflow_id, parent_id, node_id, node_table_name, created_at, updated_at
+            id, project_id, workflow_id, parent_id, node_id, node_table_name, workflow_name, created_at, updated_at
         ) VALUES (
-            #{id}, #{projectId}, #{workflowId}, #{parentId}, #{nodeId}, #{nodeTableName}, now(), now()
+            #{id}, #{projectId}, #{workflowId}, #{parentId}, #{nodeId}, #{nodeTableName}, #{workflowName}, now(), now()
         )
     </insert>
 
     <select id="selectByProjectIdAndNodeTableName" parameterType="map" resultMap="ProjectWorkflowResultMap">
-        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, created_at, updated_at
+        SELECT id, project_id, workflow_id, parent_id, node_id, node_table_name, workflow_name, created_at, updated_at
         FROM t_project_workflow
         WHERE project_id = #{projectId}
           AND node_table_name = #{nodeTableName}

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

@@ -77,10 +77,10 @@
         WHERE id = #{id}
     </update>
 
-    <!-- 按 gd_type 统计数量与面积求和（面积统一换算成“亩”）：返回 gdType, count, gdArea, gdUnit='亩' -->
+    <!-- 按 gd_type 统计数量与面积求和（面积统一换算成“亩”）：返回 gdType(空值为“其他”), count, gdArea, gdUnit='亩' -->
     <select id="countAndSumByGdType" resultType="com.siwei.apply.domain.res.ProjectSupplyRes">
         SELECT
-            gd_type AS gdType,
+            COALESCE(NULLIF(TRIM(gd_type), ''), '其他') AS gdType,
             '亩' AS gdUnit,
             COUNT(*) AS count,
             COALESCE(
@@ -93,6 +93,6 @@
                 ), 0
             ) AS gdArea
         FROM t_tdgy
-        GROUP BY gd_type
+        GROUP BY COALESCE(NULLIF(TRIM(gd_type), ''), '其他')
     </select>
 </mapper>