|
@@ -143,7 +143,7 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
|
|
|
return gconv.String(count), err
|
|
return gconv.String(count), err
|
|
|
|
|
|
|
|
case 10005: //当月新增项目数量(维度:月)
|
|
case 10005: //当月新增项目数量(维度:月)
|
|
|
- count, err := businessDao.DataScope(s.Ctx, "sale_id").WhereGTE(businessDao.C.CreatedTime, monthStart).WhereLTE(businessDao.C.CreatedTime, monthEnd).CountColumn("id")
|
|
|
|
|
|
|
+ count, err := businessDao.DataScope(s.Ctx, "sale_id").WhereGTE(businessDao.C.FilingTime, monthStart).WhereLTE(businessDao.C.FilingTime, monthEnd).CountColumn("id")
|
|
|
return gconv.String(count), err
|
|
return gconv.String(count), err
|
|
|
|
|
|
|
|
case 10006: //当月新增合同数量(维度:月)
|
|
case 10006: //当月新增合同数量(维度:月)
|
|
@@ -215,12 +215,12 @@ func (s *HomeService) QueryWechatHomeNumReportData(req *home.SearchWechatNumRepo
|
|
|
|
|
|
|
|
if req.ViewInterval == "week" {
|
|
if req.ViewInterval == "week" {
|
|
|
customerDao = customerDao.WhereGTE("created_time", weekStart).WhereLTE("created_time", weekEnd)
|
|
customerDao = customerDao.WhereGTE("created_time", weekStart).WhereLTE("created_time", weekEnd)
|
|
|
- businessDao = businessDao.WhereGTE("created_time", weekStart).WhereLTE("created_time", weekEnd)
|
|
|
|
|
|
|
+ businessDao = businessDao.WhereGTE("filing_time", weekStart).WhereLTE("filing_time", weekEnd)
|
|
|
taskHandleDao = taskHandleDao.WhereGTE("created_time", weekStart).WhereLTE("created_time", weekEnd)
|
|
taskHandleDao = taskHandleDao.WhereGTE("created_time", weekStart).WhereLTE("created_time", weekEnd)
|
|
|
}
|
|
}
|
|
|
if req.ViewInterval == "month" {
|
|
if req.ViewInterval == "month" {
|
|
|
customerDao = customerDao.WhereGTE("created_time", monthStart).WhereLTE("created_time", monthEnd)
|
|
customerDao = customerDao.WhereGTE("created_time", monthStart).WhereLTE("created_time", monthEnd)
|
|
|
- businessDao = businessDao.WhereGTE("created_time", monthStart).WhereLTE("created_time", monthEnd)
|
|
|
|
|
|
|
+ businessDao = businessDao.WhereGTE("filing_time", monthStart).WhereLTE("filing_time", monthEnd)
|
|
|
taskHandleDao = taskHandleDao.WhereGTE("created_time", monthStart).WhereLTE("created_time", monthEnd)
|
|
taskHandleDao = taskHandleDao.WhereGTE("created_time", monthStart).WhereLTE("created_time", monthEnd)
|
|
|
}
|
|
}
|
|
|
taskHandleDao = taskHandleDao.Where(platDao.PlatTaskHandle.C.TaskStatus, "10").
|
|
taskHandleDao = taskHandleDao.Where(platDao.PlatTaskHandle.C.TaskStatus, "10").
|