Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-03-22 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461

 src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -531,6 +531,18 @@
    }

    @Override
    public PaginationData<WaylineJobDTO> getJobsByWorkspaceIdNew(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam, String order) {
        Page<WaylineJobEntity> pageData = mapper.getPageNew(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId,order);

        List<WaylineJobDTO> records = pageData.getRecords()
                .stream()
                .map(this::entity2Dto)
                .collect(Collectors.toList());

        return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
    }

    @Override
    public List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {

        List<WaylineJobEntity> list = mapper.getJobs(workspaceId, waylineJobQueryParam);