|
|
@@ -60,7 +60,7 @@ func (s *taskService) GetList(req *model.SearchPlatTaskReq) (total int, TaskList
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- err = TaskModel.Order("created_time DESC").Scan(&TaskList)
|
|
|
+ err = TaskModel.Page(req.PageNum, req.PageSize).Order("created_time DESC").Scan(&TaskList)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -71,6 +71,9 @@ func (s *taskService) Create(req *model.AddPlatTaskReq) (err error) {
|
|
|
return
|
|
|
}
|
|
|
platTask.IsOverdue = "10" // 是否超期(10否20是)
|
|
|
+ if platTask.TaskStartDate == nil {
|
|
|
+ platTask.TaskStartDate = gtime.Now()
|
|
|
+ }
|
|
|
// 填充创建信息
|
|
|
service.SetCreatedInfo(platTask, s.GetCxtUserId(), s.GetCxtUserName())
|
|
|
// 填充更新信息
|
|
|
@@ -95,11 +98,14 @@ func (s *taskService) ChangeStatus(req *model.ChangeStatusReq) (err error) {
|
|
|
desc := "修改成功"
|
|
|
// 类型合规判断
|
|
|
if req.Type == "TaskStatus" {
|
|
|
+ data = fmt.Sprintf("task_status='%v'", req.NowStatus)
|
|
|
nodeName = "任务状态修改"
|
|
|
if req.NowStatus == "20" {
|
|
|
desc = "任务关闭"
|
|
|
+ } else if req.NowStatus == "30" {
|
|
|
+ desc = "任务完成"
|
|
|
+ data += fmt.Sprintf(",task_end_date='%v'", gtime.Now().Format("Y-m-d H:i:s"))
|
|
|
}
|
|
|
- data = fmt.Sprintf("task_status='%v'", req.NowStatus)
|
|
|
} else if req.Type == "IsOverdue" {
|
|
|
nodeName = "超期状态修改"
|
|
|
if req.NowStatus == "20" {
|