Merge branch 'crm/13.9' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_report.go

@@ -3412,31 +3412,31 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 
 	var conditionAscribRai string // 处理权益未续约客户检索列表SQL查询条件
 	var parsAscribeRai []interface{}
-	//是否确认续约 CRM 13.9
-	if isConfirm != -1 {
-		var conditionConfirm string
-		var parsConfirm []interface{}
+	var conditionConfirm string
+	var parsConfirm []interface{}
 
-		companyConfirmList, err := company.GetCompanyNoRenewedAscribeList(conditionConfirm, parsConfirm, 0, 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，GetCompanyNoRenewedAscribeList Err:" + err.Error()
-			return
-		}
-		var companyIds []int
-		if len(companyConfirmList) == 0 {
-			companyIds = append(companyIds, 0) // 给一个不存在的ID
-		} else {
-			for _, v := range companyConfirmList {
-				companyIds = append(companyIds, v.CompanyId)
-			}
+	companyConfirmList, err := company.GetCompanyNoRenewedAscribeList(conditionConfirm, parsConfirm, 0, 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetCompanyNoRenewedAscribeList Err:" + err.Error()
+		return
+	}
+	var noRenewedcompanyIds []int //已经确定未续约的公司ID
+	if len(companyConfirmList) == 0 {
+		noRenewedcompanyIds = append(noRenewedcompanyIds, 0) // 给一个不存在的ID
+	} else {
+		for _, v := range companyConfirmList {
+			noRenewedcompanyIds = append(noRenewedcompanyIds, v.CompanyId)
 		}
+	}
+	//是否确认续约 CRM 13.9
+	if isConfirm != -1 {
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
 		} else {
-			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)   OR c.product_id = 1 )` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
 		}
-		parsAscribeRai = append(parsAscribeRai, companyIds)
+		parsAscribeRai = append(parsAscribeRai, noRenewedcompanyIds)
 	}
 
 	//归因ID CRM 13.9
@@ -3710,7 +3710,12 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		pars1 = append(pars1, "try_out")
 		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
-		total, err := models.GetIncrementalCompanyCountByOperationRecord(condition1, pars1)
+		//未续约这里只统计已经确定的
+		notRenewalCondition := condition1
+		notRenewalPars := pars1
+		notRenewalCondition += conditionAscribRai
+		notRenewalPars = append(notRenewalPars, parsAscribeRai)
+		total, err := models.GetIncrementalCompanyCountByOperationRecord(notRenewalCondition, notRenewalPars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()

models/cygx/resource_data.go

@@ -17,6 +17,14 @@ type CygxResourceData struct {
 	SearchTag   string    `description:"搜索标签"`
 }
 
+// 根据资源类型获取列表
+func GetCygxResourceDataListBysource(source string) (items []*CygxResourceData, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_resource_data as art WHERE 1= 1  AND  source = ? `
+	_, err = o.Raw(sql, source).QueryRows(&items)
+	return
+}
+
 // 添加
 func AddCygxResourceData(item *CygxResourceData) (lastId int64, err error) {
 	o := orm.NewOrm()

services/cygx/resource_data.go

@@ -800,105 +800,105 @@ func UpdateMinutesSummaryResourceData(sourceId int) {
 	return
 }
 
-func init1() {
-	var condition string
-	var pars []interface{}
+func init1123232() {
+	//var condition string
+	//var pars []interface{}
 	//
 	//{
 	//	//活动
-	//	list, err := cygx.GetActivityListAll(condition, pars, 0, 9999999)
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ACTIVITY)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ActivityId)
-	//		UpdateActivityResourceData(v.ActivityId)
+	//		fmt.Println(v.Source)
+	//		//UpdateActivityResourceData(v.SourceId)
 	//	}
 	//}
 
 	//{
 	//	//专项调研活动
-	//	list, err := cygx.GetActivityListSpecialAll(condition, pars, 0, 9999999)
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ACTIVITYSPECIAL)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ActivityId)
-	//		UpdateActivitySpecialResourceData(v.ActivityId)
+	//		fmt.Println(v.Source)
+	//		UpdateActivitySpecialResourceData(v.SourceId)
 	//	}
 	//}
 
 	//{
 	//	//文章
-	//	list, err := cygx.GetArticlList(condition, pars, 0, 9999999)
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ARTICLE)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ArticleId)
-	//		UpdateArticleResourceData(v.ArticleId)
+	//		fmt.Println(v.Source)
+	//		UpdateArticleResourceData(v.SourceId)
 	//	}
 	//}
 
 	//{
 	//	//产品内测
-	//	list, err := cygx.GetCygxProductInteriorList(condition, pars, 0, 9999999)
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_PRODUCTINTERIOR)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ProductInteriorId)
-	//		UpdateProductInteriorResourceData(v.ProductInteriorId)
+	//		fmt.Println(v.Source)
+	//		//UpdateProductInteriorResourceData(v.SourceId)
 	//	}
 	//}
 	//
 
-	{
-		//晨会精华
-		list, err := cygx.GetCygxMorningMeetingReviewChapterList(condition, pars, 0, 9999999)
-		if err != nil {
-			fmt.Println(err)
-		}
-		for _, v := range list {
-			fmt.Println(v.Id)
-			UpdateMeetingreviewchaptResourceData(v.Id)
-		}
-	}
-
-	//
 	//{
-	//	//重点公司
-	//	list, err := cygx.GetReportSelectionList(condition, pars, 0, 9999999)
+	//	//晨会精华
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_MEETINGREVIEWCHAPT)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ArticleId)
-	//		UpdateReportSelectionResourceData(v.ArticleId)
+	//		fmt.Println(v.Source)
+	//		UpdateMeetingreviewchaptResourceData(v.SourceId)
 	//	}
 	//}
+
 	//
 	//{
-	//	//更新本周研究汇总
-	//	list, err := cygx.GetResearchSummaryList(condition, pars, 0, 9999999)
+	//	//重点公司
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_REPORTSELECTION)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ArticleId)
-	//		UpdateResearchSummaryResourceData(v.ArticleId)
+	//		fmt.Println(v.Source)
+	//		//UpdateReportSelectionResourceData(v.SourceId)
 	//	}
 	//}
 	//
 	//{
 	//	//更新本周研究汇总
-	//	list, err := cygx.GetMinutesSummaryList(condition, pars, 0, 9999999)
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_RESEARCHSUMMARY)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.ArticleId)
-	//		UpdateMinutesSummaryResourceData(v.ArticleId)
+	//		fmt.Println(v.Source)
+	//		//UpdateResearchSummaryResourceData(v.SourceId)
 	//	}
 	//}
+	//
+	{
+		//更新本周研究汇总
+		list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_MINUTESSUMMARY)
+		if err != nil {
+			fmt.Println(err)
+		}
+		for _, v := range list {
+			fmt.Println(v.Source)
+			//UpdateMinutesSummaryResourceData(v.SourceId)
+		}
+	}
 }