Merge branch 'crm/crm_16.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -115,8 +115,13 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		//pars = append(pars, adminId)
 	} else {
 
-		//根据当前角色来获取查询条件
-		condition, pars = getQueryParamsInit(condition, pars, sysUser, "c.")
+		if dataType == "未续约客户" {
+			//根据当前角色来获取查询条件
+			condition, pars = getQueryParams(condition, pars, sysUser, "c.")
+		} else {
+			//根据当前角色来获取查询条件
+			condition, pars = getQueryParamsInit(condition, pars, sysUser, "c.")
+		}
 
 	}
 	if regionType != "" {
@@ -361,7 +366,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 
 		//销售筛选条件
 		if adminId != "" {
-			condition1 += ` AND a.seller_id_init in  (` + adminId + `) `
+			condition1 += ` AND c.seller_id in  (` + adminId + `) `
 		}
 
 		//未续约已确认数量
@@ -446,6 +451,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			var ascribecompanyIds []int
 			var companyContractIds []int
 			for _, item := range tmpList {
+				fmt.Println(item)
 				//endDateTime, _ := time.Parse(utils.FormatDateTime, item.CreateTime)
 				//item.EndDate = endDateTime.Format(utils.FormatDate)
 				ascribecompanyIds = append(ascribecompanyIds, item.CompanyId)

models/statistic_report.go

@@ -901,7 +901,7 @@ func GetIncrementalCompanyListByOperationRecordMerge(condition string, pars []in
 	o := orm.NewOrm()
 
 	//查询真正的数据
-	sql := `SELECT a.company_contract_id,a.contract_type ,a.company_product_id ,a.contract_code ,a.pay_method ,a.pay_channel ,a.package_difference ,a.company_id, a.start_date, a.end_date, a.money, b.company_name, c.seller_id, a.seller_name_init as  seller_name, a.product_id, a.product_name, a.create_time, b.region_type, c.renewal_reason, c.renewal_todo, c.status ,c.share_seller FROM company_contract a
+	sql := `SELECT a.company_contract_id,a.contract_type ,a.company_product_id ,a.contract_code ,a.pay_method ,a.pay_channel ,a.package_difference ,a.company_id, a.start_date, a.end_date, a.money, b.company_name, c.seller_id, c.seller_name, a.product_id, a.product_name, a.create_time, b.region_type, c.renewal_reason, c.renewal_todo, c.status ,c.share_seller FROM company_contract a
 		RIGHT JOIN company b ON a.company_id = b.company_id
 		JOIN company_product c ON b.company_id = c.company_id 
 		AND a.product_id = c.product_id  where 1=1  `
@@ -916,7 +916,6 @@ func GetIncrementalCompanyListByOperationRecordMerge(condition string, pars []in
 	return
 }
 
-// GetIncrementalCompanyListByOperationRecordMerge 未续约合同
 func GetIncrementalCompanyListByOperationRecordMerge879() (items []*IncrementalList, err error) {
 	o := orm.NewOrm()
 	//查询真正的数据