|
|
@@ -142,6 +142,7 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
|
|
|
businessDao := projDao.NewProjBusinessDao(s.Tenant)
|
|
|
busDynamicsDao := projDao.NewProjBusinessDynamicsDao(s.Tenant)
|
|
|
contractDao := contDao.NewCtrContractDao(s.Tenant)
|
|
|
+ contractCollDao := contDao.NewCtrContractCollectionDao(s.Tenant)
|
|
|
distDao := baseDao.NewBaseDistributorDao(s.Tenant)
|
|
|
taskDao := platDao.NewPlatTaskDao(s.Tenant)
|
|
|
currentTime := gtime.Now()
|
|
|
@@ -181,8 +182,7 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
|
|
|
return gconv.String(count), err
|
|
|
|
|
|
case 10008: //当月回款金额（维度：月）
|
|
|
- count, err := contractDao.DataScope(s.Ctx, "incharge_id").WhereGTE(contractDao.C.ContractStartTime, monthStart).WhereLTE(contractDao.C.CreatedTime, monthEnd).
|
|
|
- Sum(contractDao.C.CollectedAmount)
|
|
|
+ count, err := contractCollDao.Where("appro_status = 20").Where("collection_datetime >= ?", monthStart).Where("collection_datetime <= ?", monthEnd).Sum("contract_amount")
|
|
|
return gconv.String(count), err
|
|
|
|
|
|
case 10009: //当年的签约金额（维度：年）
|
liuyaqi