no message

models/rai_serve/rai_serve_company.go

@@ -58,7 +58,7 @@ func AddCygxRaiServeCompanyMulti(items, itemsUpdate []*CygxRaiServeCompany, delC
 	}
 
 	if len(itemsUpdate) > 0 {
-		p, errUpdate := o.Raw("UPDATE cygx_rai_serve_company SET company_name = ? ,seller_id =? ,seller_name = ?  ,start_date = ? ,end_date = ? ,share_seller = ? ,share_seller_id = ? ,group_id = ? ,share_group_id = ?  WHERE company_id = ?").Prepare()
+		p, errUpdate := o.Raw("UPDATE cygx_rai_serve_company SET company_name = ? ,seller_id =? ,seller_name = ?  ,start_date = ? ,end_date = ? ,share_seller = ? ,share_seller_id = ? ,group_id = ? ,share_group_id = ?,status = ?  WHERE company_id = ?").Prepare()
 		if errUpdate != nil {
 			err = errUpdate
 			return
@@ -68,7 +68,7 @@ func AddCygxRaiServeCompanyMulti(items, itemsUpdate []*CygxRaiServeCompany, delC
 		}()
 
 		for _, v := range itemsUpdate {
-			_, err = p.Exec(v.CompanyName, v.SellerId, v.SellerName, v.StartDate, v.EndDate, v.ShareSeller, v.ShareSellerId, v.GroupId, v.ShareGroupId, v.CompanyId)
+			_, err = p.Exec(v.CompanyName, v.SellerId, v.SellerName, v.StartDate, v.EndDate, v.ShareSeller, v.ShareSellerId, v.GroupId, v.ShareGroupId, v.Status, v.CompanyId)
 			if err != nil {
 				return
 			}

services/rai_serve_count.go

@@ -300,7 +300,7 @@ func GetCompanyReportPermissionNameMapByCompanyId(companyIds []int) (mapContract
 	var condition string
 	var pars []interface{}
 
-	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ") AND product_id = 2 AND status = '正式' "
+	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ") AND product_id = 2 AND status  IN ( '正式','永续') "
 	pars = append(pars, companyIds)
 
 	permissionList, e := models.GetChartPermissionList()
@@ -1174,6 +1174,10 @@ func UpdateCygxRaiServeBillWeekTask() (err error) {
 	return
 }
 
+//func init() {
+//	UpdateWeekAvg()
+//}
+
 // 更新最近四周平均覆盖率，是否标红，权限，时间，金额
 func UpdateWeekAvg() (err error) {
 	defer func() {
@@ -1230,8 +1234,9 @@ func UpdateWeekAvg() (err error) {
 	var formalCompanyIds []int   // 当前正式客户ID
 	var formalNoCompanyIds []int // 当前非正式客户ID
 
+	//永续客户当做正式客户处理
 	for _, v := range companyList {
-		if v.Status == "正式" {
+		if v.Status == "正式" || v.Status == "永续" {
 			formalCompanyIds = append(formalCompanyIds, v.CompanyId)
 		} else {
 			formalNoCompanyIds = append(formalNoCompanyIds, v.CompanyId)