[inlong] branch master updated: [INLONG-9051][Manager] Add consumer group in the approval form (#9052)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new adc5bb878f [INLONG-9051][Manager] Add consumer group in the approval 
form (#9052)
adc5bb878f is described below

commit adc5bb878fa95a4ed19ed7be50e1dc3fe87d3a5e
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Fri Oct 13 18:57:21 2023 +0800

    [INLONG-9051][Manager] Add consumer group in the approval form (#9052)
---
 .../manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml | 2 +-
 .../manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
 
b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
index d415c4efb9..55889c89c1 100644
--- 
a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
+++ 
b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
@@ -132,7 +132,7 @@
         </where>
         order by id desc
     </select>
-    <select id="countByStatus">
+    <select id="countByStatus" resultType="java.lang.Integer">
         select count(1)
         from workflow_task
         where tenant = #{tenant,jdbcType=VARCHAR}
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java
index 69fd69b1b9..4b6792604c 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java
@@ -60,6 +60,7 @@ public class ApplyConsumeProcessForm extends BaseProcessForm {
         Map<String, Object> show = Maps.newHashMap();
         if (consumeInfo != null) {
             show.put("inlongGroupId", consumeInfo.getInlongGroupId());
+            show.put("consumerGroup", consumeInfo.getConsumerGroup());
         }
         return show;
     }