Merge branch 'CRM_15.5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/enter_score.go

@@ -584,7 +584,7 @@ func (this *EnterScoreController) EnterScoreList() {
 	var condition string
 	var pars []interface{}
 	//如果不是权益管理员和admin，就做可见权限限制
-	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_RESEARCHR {
 		var conditionAdmin string
 		var parsAdmin []interface{}
 		conditionAdmin = "  AND product_id = 2  AND   status = '永续'  AND seller_id =  ?  "

models/cygx/activity_ask_email.go

@@ -30,7 +30,7 @@ func GetAskEmailList() (item []*AskEmailRep, err error) {
 func UpdateAskEmail(item *AskEmailRep) (err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_ask_email SET admin_id=? where mobile=?`
-	_, err = o.Raw(sql,item.AdminId,item.Mobile).Exec()
+	_, err = o.Raw(sql, item.AdminId, item.Mobile).Exec()
 	return
 }
 

models/cygx/chart_permission.go

@@ -113,9 +113,9 @@ func GetCategoryInfoById(chartPermissionId int) (item *ChartPermission, err erro
 
 // 通过名称获取分类详情
 func GetCategoryInfoByName(name string) (item *ChartPermission, err error) {
-	if name == "宏观" {
-		name = "宏观经济"
-	}
+	//if name == "宏观" {
+	//	name = "宏观经济"
+	//}
 	o := orm.NewOrm()
 	sql := `SELECT * FROM chart_permission WHERE permission_name=? AND parent_id>0`
 	err = o.Raw(sql, name).QueryRow(&item)

services/contract/contract.go

@@ -1785,3 +1785,42 @@ func GetCompanyContractCountRaiByLastYear(companyId int, startDate string) (tota
 	}
 	return
 }
+
+func initCRM15_5() {
+	var condition string
+	var pars []interface{}
+
+	condition = " AND  rai_contract_type  = '新签合同'  AND  product_id = 2 "
+	companyContractList, e := company.GetCompanyContractList(condition, pars)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+	var CompanyContractIdS []int
+	for k, v := range companyContractList {
+		fmt.Println(k)
+		firstContractRai, err := company.GetFirstContractRai(v.CompanyId)
+		if err != nil {
+			fmt.Println(err)
+			continue
+		}
+
+		if firstContractRai.CompanyContractId == v.CompanyContractId {
+			continue
+		}
+		//判断是否是在一年以内
+		startDateTime, _ := time.Parse(utils.FormatDate, v.StartDate)
+		startDateTime = startDateTime.AddDate(-1, 0, 0)
+		startDateTimeFirst, _ := time.Parse(utils.FormatDate, firstContractRai.StartDate)
+		if !startDateTime.Before(startDateTimeFirst) {
+			CompanyContractIdS = append(CompanyContractIdS, v.CompanyContractId)
+		}
+	}
+	fmt.Println("companyContractIds", len(CompanyContractIdS))
+	fmt.Println("companyContractIds", (CompanyContractIdS))
+	//
+	//fmt.Println(strings.Join(companyContractIds, ","))
+	//err := company.UpdateCompanyContractRaiContractTypeInit(strings.Join(companyContractIds, ","))
+	//fmt.Println(err)
+	return
+}

services/roadshow/calendar.go

@@ -768,7 +768,9 @@ func SyncCalendarFromShanghai(userPhone, startDate, endDate string) (err error)
 									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RESEARCHR ||
 									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
 									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_DEPARTMENT ||
-									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_DEPARTMENT {
+									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_DEPARTMENT ||
+									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+									researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 
 									researcherList = append(researcherList, researcherInfo)
 									researcherMap[researcherInfo.AdminId] = researcherInfo
@@ -857,6 +859,8 @@ func SyncCalendarFromShanghai(userPhone, startDate, endDate string) (err error)
 							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
 							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_DEPARTMENT ||
 							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_DEPARTMENT ||
+							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN ||
 							researcherInfo.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
 							researcherList = append(researcherList, researcherInfo)
 						}