|
|
@@ -10,6 +10,7 @@ import (
|
|
|
custDao "dashoo.cn/micro/app/dao/cust"
|
|
|
platDao "dashoo.cn/micro/app/dao/plat"
|
|
|
projDao "dashoo.cn/micro/app/dao/proj"
|
|
|
+ baseDao "dashoo.cn/micro/app/dao/base"
|
|
|
"dashoo.cn/micro/app/model/home"
|
|
|
"dashoo.cn/micro/app/model/plat"
|
|
|
"dashoo.cn/micro/app/service"
|
|
|
@@ -93,7 +94,7 @@ func (s *HomeService) QueryHomeDataReportData(param *home.SearchDataReportData)
|
|
|
// 20000-30000之间：报表数据 TODO 疑似与 sys_report 表对应？
|
|
|
func (s *HomeService) getReportData(id int64, params *map[string]interface{}) (interface{}, error) {
|
|
|
switch id {
|
|
|
- case 10000, 10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10010, 10011, 10012, 10013, 10014, 10015, 10016:
|
|
|
+ case 10000, 10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10010, 10011, 10012, 10013, 10014, 10015, 10016, 10017, 10018:
|
|
|
// 获取数值指标统计数据
|
|
|
return s.getNumStatisticsData(id, params)
|
|
|
case 20000:
|
|
|
@@ -141,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)
|
|
|
+ distDao := baseDao.NewBaseDistributorDao(s.Tenant)
|
|
|
taskDao := platDao.NewPlatTaskDao(s.Tenant)
|
|
|
currentTime := gtime.Now()
|
|
|
monthStart := currentTime.StartOfMonth()
|
|
|
@@ -224,6 +226,12 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
|
|
|
Where("year(contract_sign_time) = ?", time.Now().Year()).
|
|
|
Sum(contractDao.C.ContractAmount + " - " + contractDao.C.CollectedAmount)
|
|
|
return gconv.String(count), err
|
|
|
+ case 10017: //当月新增经销商数量：统计自然月当月新创建的经销商数量。
|
|
|
+ count, err := distDao.Where("dist_type = '10'").Where("created_time >= ?",monthStart).Where("created_time <= ?",monthEnd).Count()
|
|
|
+ return gconv.String(count), err
|
|
|
+ case 10018: //进行中的督办：统计正在进行的督办数量。
|
|
|
+ count, err := taskDao.Where("task_status = '20'").Count()
|
|
|
+ return gconv.String(count), err
|
|
|
}
|
|
|
return "", nil
|
|
|
}
|
liuyaqi