|
|
@@ -74,8 +74,8 @@ func (f *Front) GroupTaskListByAdmin() {
|
|
|
status := f.GetString("s_status")
|
|
|
searchStr := f.GetString("search[value]")
|
|
|
search := strings.TrimSpace(searchStr)
|
|
|
- starttime, _ := f.GetInt("starttime")
|
|
|
- endtime, _ := f.GetInt("endtime")
|
|
|
+ starttime, _ := f.GetInt("i_starttime")
|
|
|
+ completetime, _ := f.GetInt("i_completetime")
|
|
|
query := map[string]interface{}{
|
|
|
"s_stype": "group", //检索用户组任务
|
|
|
}
|
|
|
@@ -84,9 +84,9 @@ func (f *Front) GroupTaskListByAdmin() {
|
|
|
"$gte": starttime,
|
|
|
}
|
|
|
}
|
|
|
- if endtime > 0 {
|
|
|
+ if completetime > 0 {
|
|
|
query["i_completetime"] = map[string]interface{}{
|
|
|
- "$lte": endtime,
|
|
|
+ "$lte": completetime,
|
|
|
}
|
|
|
}
|
|
|
if status != "-1" { //任务状态
|
|
|
@@ -294,6 +294,7 @@ func (f *Front) GroupTaskExport() {
|
|
|
"i_completetime": 1,
|
|
|
}
|
|
|
list, _ := util.Mgo.Find(util.TASKCOLLNAME, query, nil, fields, false, -1, -1)
|
|
|
+ qu.Debug(len(*list))
|
|
|
for _, l := range *list {
|
|
|
row := sheet.AddRow()
|
|
|
entname := qu.ObjToString(l["s_entname"])
|
