Browse Source

fix a few bugs (#7703)

3.0.0/version-upgrade
calvin 3 years ago committed by GitHub
parent
commit
71ccb42697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
  2. 2
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
  3. 1
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
  4. 1
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

4
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java

@ -180,11 +180,11 @@ public class TaskGroupController extends BaseController {
} }
/** /**
* query task group list paging by project id * query task group list paging by project code
* *
* @param loginUser login user * @param loginUser login user
* @param pageNo page number * @param pageNo page number
* @param projectCode project id * @param projectCode project code
* @param pageSize page size * @param pageSize page size
* @return queue list * @return queue list
*/ */

2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java

@ -85,7 +85,7 @@ public interface TaskGroupService {
* @param loginUser login user * @param loginUser login user
* @param pageNo page no * @param pageNo page no
* @param pageSize page size * @param pageSize page size
* @param name name * @param projectCode project code
* @return the result code and msg * @return the result code and msg
*/ */
Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode); Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode);

1
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

@ -1073,7 +1073,6 @@ CREATE TABLE t_ds_task_group
project_code bigint(20) DEFAULT '0', project_code bigint(20) DEFAULT '0',
use_size int(11) DEFAULT '0' , use_size int(11) DEFAULT '0' ,
user_id int(11) DEFAULT NULL , user_id int(11) DEFAULT NULL ,
project_id int(11) DEFAULT NULL ,
status int(4) DEFAULT '1' , status int(4) DEFAULT '1' ,
create_time datetime DEFAULT NULL , create_time datetime DEFAULT NULL ,
update_time datetime DEFAULT NULL , update_time datetime DEFAULT NULL ,

1
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

@ -1057,7 +1057,6 @@ CREATE TABLE t_ds_task_group (
project_code bigint DEFAULT '0' , project_code bigint DEFAULT '0' ,
use_size int DEFAULT '0' , use_size int DEFAULT '0' ,
user_id int DEFAULT NULL , user_id int DEFAULT NULL ,
project_id int DEFAULT NULL ,
status int DEFAULT '1' , status int DEFAULT '1' ,
create_time timestamp DEFAULT NULL , create_time timestamp DEFAULT NULL ,
update_time timestamp DEFAULT NULL , update_time timestamp DEFAULT NULL ,

Loading…
Cancel
Save