Просмотр исходного кода

fix(跟进): 需求调整,增加对评论数量的统计

likai 3 лет назад
Родитель
Сommit
55eb68c649

+ 2 - 1
opms_parent/app/model/plat/plat_followup.go

@@ -47,10 +47,11 @@ type AddPlatFollowupReq struct {
 type FollowupInfo struct {
 	PlatFollowup
 	Comments      []*PlatFollowupComment        `json:"comments"`                                     // 评论
+	CommentNumber int                           `json:"commentNumber"`                                // 评论数量
 }
 
 // 跟进记录详情展示,按日期返回前端结果
 type FollowupInfoResp struct {
 	FollowDay     string   `json:"followDay"`     // 跟进记录的当天日期
-	FollowupList      []*FollowupInfo        `json:"followupList"`                                     // 评论
+	FollowupList      []*FollowupInfo        `json:"followupList"`                                     // 跟进记录
 }

+ 1 - 0
opms_parent/app/service/plat/plat_followup.go

@@ -170,6 +170,7 @@ func (s *followupService) GetListByDay(req *model.SearchPlatFollowupReq) (total
 		if _, ok := commentMap[followup.Id]; ok {
 			originalFollowupList[index].Comments = append(originalFollowupList[index].Comments, commentMap[followup.Id]...)
 		}
+		originalFollowupList[index].CommentNumber = len(originalFollowupList[index].Comments)
 		followupMap[followup.FollowDate.Format("Y-m-d")] = append(followupMap[followup.FollowDate.Format("Y-m-d")], &originalFollowupList[index])
 	}
 

+ 8 - 2
opms_parent/app/service/plat/plat_task.go

@@ -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" {