diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
index 605daef00b..88d57e7a62 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
@@ -384,15 +384,17 @@ public class DataAnalysisService {
}
Integer taskQueueCount = 0;
Integer taskKillCount = 0;
+ int[] projectIds = new int[1];
+ projectIds[0] = projectId;
if (tasksQueueIds.length != 0){
taskQueueCount = taskInstanceMapper.countTask(
- loginUser.getId(),loginUser.getUserType(),String.valueOf(projectId),
- StringUtils.join(tasksQueueIds, ","));
+ loginUser.getId(),loginUser.getUserType(),projectIds,
+ tasksQueueIds);
}
if (tasksKillIds.length != 0){
- taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksKillIds);
+ taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(), projectIds, tasksKillIds);
}
diff --git a/escheduler-common/.factorypath b/escheduler-common/.factorypath
deleted file mode 100644
index 2686695490..0000000000
--- a/escheduler-common/.factorypath
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java
index 58ea6da3fe..e8029f8b34 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java
@@ -45,38 +45,4 @@ public interface ProcessDefinitionMapper extends BaseMapper {
List countDefinitionGroupByUser(
@Param("userId") Integer userId,
@Param("projectIds") Integer[] projectIds);
-
- /**
- * update receivers and cc by definition id
- * @param receivers
- * @param receiversCc
- * @param processDefinitionId
- * @return
- */
- @UpdateProvider(type = ProcessDefinitionMapperProvider.class, method = "updateReceiversAndCcById")
- int updateReceiversAndCcById(@Param("receivers") String receivers,
- @Param("receiversCc") String receiversCc,
- @Param("processDefinitionId") int processDefinitionId);
-
- /**
- * query all
- * @return
- */
- @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER),
- @Result(property = "name", column = "name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
- @Result(property = "version", column = "version", javaType = Integer.class, jdbcType = JdbcType.TINYINT),
- @Result(property = "releaseState", column = "release_state", typeHandler = EnumOrdinalTypeHandler.class, javaType = ReleaseState.class, jdbcType = JdbcType.TINYINT),
- @Result(property = "projectId", column = "project_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
- @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
- @Result(property = "desc", column = "desc", javaType = String.class, jdbcType = JdbcType.VARCHAR),
- @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
- @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
- @Result(property = "flag", column = "flag", typeHandler = EnumOrdinalTypeHandler.class, javaType = Flag.class, jdbcType = JdbcType.TINYINT),
- @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
- @Result(property = "timeout", column = "timeout", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
- @Result(property = "tenantId", column = "tenant_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
- @Result(property = "projectName", column = "project_name", javaType = String.class, jdbcType = JdbcType.VARCHAR)
- })
- @SelectProvider(type = ProcessDefinitionMapperProvider.class, method = "queryAll")
- List queryAll();
}
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
index 044495f12a..9e81d8d9c6 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
@@ -50,8 +50,8 @@ public interface TaskInstanceMapper extends BaseMapper {
Integer countTask(@Param("userId") int userId,
@Param("userType") UserType userType,
- @Param("projectIds") String projectIds,
- @Param("taskIds") String taskIds);
+ @Param("projectIds") int[] projectIds,
+ @Param("taskIds") int[] taskIds);
List countTaskInstanceStateByUser(@Param("userId") int userId,
@Param("userType") UserType userType,
diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml
index 3df40f0711..91260d43dc 100644
--- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml
+++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml
@@ -60,7 +60,12 @@
and process.project_id in (#{projectIds})
- and task.id in (#{taskIds})
+
+ and task.id in
+
+ #{i}
+
+