Skip to content

Commit 7f719e3

Browse files
mark8smark8s
committed
update
1 parent 9f93335 commit 7f719e3

24 files changed

+152
-97
lines changed

‎api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package flow
22

33
import (
44
"errors"
5+
"flow/schema"
56
"net/http"
67
"strconv"
78

8-
"github.com/antlinker/flow/schema"
99
"github.com/teambition/gear"
1010
)
1111

‎bll/b_flow.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package bll
22

33
import (
4+
"flow/model"
5+
"flow/schema"
6+
"flow/util"
47
"fmt"
58
"sync"
69
"time"
7-
8-
"github.com/antlinker/flow/model"
9-
"github.com/antlinker/flow/schema"
10-
"github.com/antlinker/flow/util"
1110
)
1211

1312
// Flow 流程管理
@@ -377,8 +376,8 @@ func (a *Flow) QueryTodoFlowInstanceResult(userID, typeCode, flowCode string, la
377376
}
378377

379378
// QueryWebTodoFlowInstanceResult web查询待办的流程实例数据
380-
func (a *Flow) QueryWebTodoFlowInstanceResult(userID, typeCode, flowCode string, count int,ParamSearchList map[string]string) ([]*schema.FlowWebInstanceResult,int64, error) {
381-
return a.FlowModel.QueryTodoWebFlowInstanceResult(userID, typeCode, flowCode, count,ParamSearchList)
379+
func (a *Flow) QueryWebTodoFlowInstanceResult(userID, typeCode, flowCode string, count int, ParamSearchList map[string]string) ([]*schema.FlowWebInstanceResult, int64, error) {
380+
return a.FlowModel.QueryTodoWebFlowInstanceResult(userID, typeCode, flowCode, count, ParamSearchList)
382381
}
383382

384383
// QueryHandleFlowInstanceResult 查询处理的流程实例结果
@@ -387,8 +386,8 @@ func (a *Flow) QueryHandleFlowInstanceResult(processor, typeCode, flowCode strin
387386
}
388387

389388
// QueryWebHandleFlowInstanceResult web查询处理的流程实例结果
390-
func (a *Flow) QueryWebHandleFlowInstanceResult(processor, typeCode, flowCode string, lastID int64, count int , ParamSearchList map[string]string ) ([]*schema.FlowInstanceResult,int64, error) {
391-
return a.FlowModel.QueryWebHandleFlowInstanceResult(processor, typeCode, flowCode, lastID, count,ParamSearchList)
389+
func (a *Flow) QueryWebHandleFlowInstanceResult(processor, typeCode, flowCode string, lastID int64, count int, ParamSearchList map[string]string) ([]*schema.FlowInstanceResult, int64, error) {
390+
return a.FlowModel.QueryWebHandleFlowInstanceResult(processor, typeCode, flowCode, lastID, count, ParamSearchList)
392391
}
393392

394393
// QueryLastNodeInstances 查询流程实例的最后一个节点实例
@@ -406,9 +405,9 @@ func (a *Flow) QueryLastNodeInstances(flowInstanceIDs []string) (map[string]*sch
406405
}
407406

408407
// QueryWebLastNodeInstances web查询流程实例的最后一个节点实例
409-
func (a *Flow) QueryWebLastNodeInstances(flowInstanceIDs []string,ParamSearchList map[string]string,isComplete bool) (map[string]*schema.NodeInstance, error) {
408+
func (a *Flow) QueryWebLastNodeInstances(flowInstanceIDs []string, ParamSearchList map[string]string, isComplete bool) (map[string]*schema.NodeInstance, error) {
410409

411-
items, err := a.FlowModel.QueryWebLastNodeInstances(flowInstanceIDs,ParamSearchList,isComplete)
410+
items, err := a.FlowModel.QueryWebLastNodeInstances(flowInstanceIDs, ParamSearchList, isComplete)
412411
if err != nil {
413412
return nil, err
414413
}

‎context.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package flow
22

33
import (
44
"context"
5-
6-
"github.com/antlinker/flow/expression"
5+
"flow/expression"
76
)
87

98
type (

‎engine.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ import (
44
"context"
55
"database/sql"
66
"encoding/json"
7+
"flow/bll"
8+
"flow/register"
9+
"flow/schema"
10+
"flow/service/db"
11+
"flow/util"
712
"fmt"
13+
"github.com/facebookgo/inject"
14+
"github.com/pkg/errors"
815
"io/ioutil"
916
"os"
1017
"path/filepath"
1118
"strconv"
1219
"sync"
1320
"time"
14-
15-
"github.com/antlinker/flow/bll"
16-
"github.com/antlinker/flow/register"
17-
"github.com/antlinker/flow/schema"
18-
"github.com/antlinker/flow/service/db"
19-
"github.com/antlinker/flow/util"
20-
"github.com/facebookgo/inject"
21-
"github.com/pkg/errors"
2221
)
2322

2423
// Logger 定义日志接口

‎example/server.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ package main
22

33
import (
44
"flag"
5+
"flow"
6+
"flow/service/db"
57
"fmt"
8+
"github.com/teambition/gear"
69
"log"
710
"net/http"
811

9-
"github.com/antlinker/flow"
10-
"github.com/antlinker/flow/service/db"
11-
12-
"github.com/teambition/gear"
13-
1412
_ "github.com/go-sql-driver/mysql"
1513
)
1614

‎exec.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package flow
33
import (
44
"context"
55
"encoding/json"
6-
7-
"github.com/antlinker/flow/expression"
6+
"flow/expression"
87
)
98

109
// Execer 表达式执行器

‎expression/builtin/exports.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package builtin
33
import (
44
"fmt"
55

6-
"qlang.io/cl/qlang"
6+
"github.com/xushiwei/qlang"
77
)
88

99
// Reg 注册内置函数，不注册不能使用

‎expression/builtin/exports_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ import (
66
)
77

88
func TestMain(m *testing.M) {
9-
Reg()
109
os.Exit(m.Run())
1110
}

‎expression/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"database/sql"
66
"time"
77

8-
"qlang.io/cl/qlang"
8+
"github.com/xushiwei/qlang"
99
)
1010

1111
type dbkey struct{}

‎expression/data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/pkg/errors"
1010

11-
"qlang.io/spec"
11+
"github.com/xushiwei/qlang/spec"
1212
)
1313

1414
// OutData 输出数据

0 commit comments

Comments
 (0)