|
@@ -1,9 +1,6 @@
|
|
|
package behavior
|
|
package behavior
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
- . "api"
|
|
|
|
|
- . "ent/entity"
|
|
|
|
|
- . "ent/util"
|
|
|
|
|
"fmt"
|
|
"fmt"
|
|
|
"github.com/go-xweb/xweb"
|
|
"github.com/go-xweb/xweb"
|
|
|
qutil "qfw/util"
|
|
qutil "qfw/util"
|
|
@@ -53,6 +50,7 @@ func (a *Action) BehaviorShow() {
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
page, _ := a.GetInteger("page")
|
|
page, _ := a.GetInteger("page")
|
|
|
|
|
+ pageSize, _ := a.GetInteger("pageSize")
|
|
|
startTime, _ := a.GetInteger("startTime")
|
|
startTime, _ := a.GetInteger("startTime")
|
|
|
endTime, _ := a.GetInteger("endTime")
|
|
endTime, _ := a.GetInteger("endTime")
|
|
|
name := a.GetString("name")
|
|
name := a.GetString("name")
|
|
@@ -88,7 +86,7 @@ func (a *Action) BehaviorShow() {
|
|
|
`+quryname+`
|
|
`+quryname+`
|
|
|
ORDER BY c.createtime`, departmentId, departmentId, frameworkEntId, frameworkEntId, startTime, endTime)
|
|
ORDER BY c.createtime`, departmentId, departmentId, frameworkEntId, frameworkEntId, startTime, endTime)
|
|
|
env:
|
|
env:
|
|
|
- count, data := Paging(page, 20, entniche_infos)
|
|
|
|
|
|
|
+ count, data := Paging(page, pageSize, entniche_infos)
|
|
|
a.ServeJson(Result{Data: M{
|
|
a.ServeJson(Result{Data: M{
|
|
|
"count": count,
|
|
"count": count,
|
|
|
"behaviorData": data,
|
|
"behaviorData": data,
|
WH01243