add TodoList

Author: xlorne

admin-ui/src/api/flow.ts

@@ -101,6 +101,17 @@ export async function flowRecordList(params: any,
 }
 
 
+export async function findAllByOperatorId(params: any,
+                                     sort: any,
+                                     filter: any,
+                                     match: {
+                                         key: string,
+                                         type: string
+                                     }[]) {
+    return page('/api/query/flowRecord/findAllByOperatorId', params, sort, filter, match);
+}
+
+
 export async function findTodoByOperatorId(params: any,
                                      sort: any,
                                      filter: any,

admin-ui/src/pages/flow/record/index.tsx

@@ -1,12 +1,12 @@
 import React, {useEffect} from "react";
 import {ActionType, PageContainer, ProTable} from "@ant-design/pro-components";
 import {
+    findAllByOperatorId,
     findDoneByOperatorId,
     findInitiatedByOperatorId,
     findPostponedTodoByOperatorId,
     findTimeoutTodoByOperatorId,
     findTodoByOperatorId,
-    flowRecordList,
     urge
 } from "@/api/flow";
 import moment from "moment";
@@ -302,7 +302,7 @@ const FlowRecordPage = () => {
                                     return record.read?"record-read":"record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
-                                    return flowRecordList(params, sort, filter, []);
+                                    return findAllByOperatorId(params, sort, filter, []);
                                 }}
                             />
                         )

example/example-application/src/main/java/com/codingapi/example/query/FlowRecordQueryController.java

@@ -45,6 +45,15 @@ public SingleResponse<FlowDetail> detail(SearchRequest searchRequest) {
     }
 
 
+
+    @GetMapping("/findAllByOperatorId")
+    public MultiResponse<FlowRecordEntity> findAllByOperatorId(SearchRequest searchRequest) {
+        User user = userRepository.getUserByUsername(TokenContext.current().getUsername());
+        PageRequest pageRequest = PageRequest.of(searchRequest.getCurrent(), searchRequest.getPageSize());
+        return MultiResponse.of(flowRecordQuery.findAllByOperatorId(user.getId(), pageRequest));
+    }
+
+
     @GetMapping("/findTodoByOperatorId")
     public MultiResponse<FlowRecordEntity> findTodoByOperatorId(SearchRequest searchRequest) {
         User user = userRepository.getUserByUsername(TokenContext.current().getUsername());

example/example-application/src/main/java/com/codingapi/example/query/app/FlowAppQueryController.java

@@ -37,6 +37,21 @@ public MultiResponse<FlowRecordEntity> list(SearchRequest searchRequest) {
     }
 
 
+    @GetMapping("/findAllByOperatorId")
+    public MultiResponse<FlowRecordEntity> findAllByOperatorId(SearchRequest searchRequest) {
+        User user = userRepository.getUserByUsername(TokenContext.current().getUsername());
+        String lastId = searchRequest.getParameter("lastId");
+        SQLBuilder sqlBuilder = new SQLBuilder("from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1  group by r.processId) ");
+        sqlBuilder.addParam(user.getId());
+        if(StringUtils.hasText(lastId)){
+            sqlBuilder.append(" and d.id < ?",Long.parseLong(lastId));
+        }
+        sqlBuilder.appendSql(" order by d.id desc ");
+        PageRequest pageRequest = PageRequest.of(0, searchRequest.getPageSize());
+        return MultiResponse.of(flowRecordQuery.dynamicPageQuery(sqlBuilder,pageRequest));
+    }
+
+
     @GetMapping("/findTodoByOperatorId")
     public MultiResponse<FlowRecordEntity> findTodoByOperatorId(SearchRequest searchRequest) {
         User user = userRepository.getUserByUsername(TokenContext.current().getUsername());

example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java

@@ -44,6 +44,9 @@ public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEnt
     @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.preId = 0 and r.nodeCode = 'start'  group by r.processId) order by d.id desc")
     Page<FlowRecordEntity> findInitiatedByOperatorId(long operatorId, PageRequest pageRequest);
 
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1  group by r.processId) order by d.id desc")
+    Page<FlowRecordEntity> findAllByOperatorId(long operatorId, PageRequest pageRequest);
+
     @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1  and r.workCode = ?2 and r.preId = 0 and r.nodeCode = 'start'  group by r.processId) order by d.id desc")
     Page<FlowRecordEntity> findInitiatedByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
 

mobile-ui/src/api/flow.ts

@@ -96,9 +96,9 @@ export async function urge(body:any) {
 
 // 待办中心控制
 
-export async function flowRecordList( lastId?: string,
+export async function findAllByOperatorId( lastId?: string,
                                       pageSize=10) {
-    return get('/api/app/query/flowRecord/list',{lastId,pageSize});
+    return get('/api/app/query/flowRecord/findAllByOperatorId',{lastId,pageSize});
 }
 
 export async function findTodoByOperatorId(lastId?: string,

mobile-ui/src/pages/flow/index.tsx

@@ -8,7 +8,7 @@ import {
     findPostponedTodoByOperatorId,
     findTimeoutTodoByOperatorId,
     findTodoByOperatorId,
-    flowRecordList,
+    findAllByOperatorId,
 } from "@/api/flow";
 import {Tabs} from "antd-mobile";
 import moment from "moment";
@@ -79,7 +79,7 @@ const FlowListPage = () => {
             return findPostponedTodoByOperatorId(last, pageSize);
         }
         if (key === 'all') {
-            return flowRecordList(last, pageSize);
+            return findAllByOperatorId(last, pageSize);
         }
     }