Merge branch 'cygx_4.4' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -1947,7 +1947,7 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 			articleIdGroup = articleIdSub + "," + articleIdInd
 		} else if articleIdSub != "" && articleIdInd == "" {
 			articleIdGroup = articleIdSub
-		} else if articleIdSub == "" && articleIdInd == "" {
+		} else if articleIdSub == "" && articleIdInd != "" {
 			articleIdGroup = articleIdInd
 		}
 		slice := strings.Split(keyWord, "/")
@@ -1955,7 +1955,7 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 			var subjectIds string
 			for _, v := range slice {
 				subjectId, err := models.GetcygxIndustrialSubjectByName(v)
-				if err != nil {
+				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取信息失败"
 					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 					return
@@ -1965,18 +1965,20 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 				}
 			}
 			subjectIds = strings.TrimRight(subjectIds, ",")
-			articleBySub, err := models.GetArticleIdsBySubId(subjectIds)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取文章关联的标的失败,Err:" + err.Error()
-				return
-			}
-			if articleIdGroup != "" {
-				if articleBySub != "" {
-					articleIdGroup += "," + articleBySub
+			if len(subjectIds) > 0 {
+				articleBySub, err := models.GetArticleIdsBySubId(subjectIds)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取文章关联的标的失败,Err:" + err.Error()
+					return
+				}
+				if articleIdGroup != "" {
+					if articleBySub != "" {
+						articleIdGroup += "," + articleBySub
+					}
+				} else {
+					articleIdGroup = articleBySub
 				}
-			} else {
-				articleIdGroup = articleBySub
 			}
 		}
 
@@ -2020,10 +2022,11 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 		}
 		for k2, v2 := range artList {
 			if artList[k2].IsReport == "1" {
-				artList[k2].Title = "【研选观点】" + v2.Title
+				artList[k2].Title = v2.Title
 			} else {
-				artList[k2].Title = "【研选纪要】" + v2.Title
+				artList[k2].Title = v2.Title
 			}
+			artList[k2].IndustryName = strings.Replace(artList[k2].IndustryName, " ", "", -1)
 		}
 		list[k].List = artList
 		if v.FollowNum > 0 {
@@ -2143,10 +2146,11 @@ func (this *ReportController) IndustryAndArticleListPc() {
 				}
 				for k2, v2 := range artList {
 					if artList[k2].IsReport == "1" {
-						artList[k2].Title = "【研选观点】" + v2.Title
+						artList[k2].Title = v2.Title
 					} else {
-						artList[k2].Title = "【研选纪要】" + v2.Title
+						artList[k2].Title = v2.Title
 					}
+					artList[k2].IndustryName = strings.Replace(artList[k2].IndustryName, " ", "", -1)
 				}
 				DepartmentList[k].List = artList
 				if v.FollowNum > 0 {

controllers/user.go

@@ -218,12 +218,25 @@ func (this *UserController) Detail() {
 			if companyItem != nil && companyItem.CompanyId > 0 {
 				detail.CompanyName = companyItem.CompanyName
 				if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
-					permissionStr, err := models.GetCompanyPermission(companyItem.CompanyId)
+					permissionStr, err := models.GetCompanyPermissionByUser(companyItem.CompanyId)
 					if err != nil {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
+					permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
+					if err != nil {
+						br.Msg = "获取信息失败"
+						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+						return
+					}
+					permissionStrListOld := strings.Split(permissionStrOld, ",")
+					for _, v := range permissionStrListOld {
+						if strings.Count(permissionStr, v) > 1 {
+							permissionStr = strings.Replace(permissionStr, v+"(主观)", v, -1)
+							permissionStr = strings.Replace(permissionStr, v+"(客观)", "", -1)
+						}
+					}
 					detail.PermissionName = permissionStr
 				} else {
 					hasPermission = 1

models/activity_signup.go

@@ -253,7 +253,7 @@ func GetActivitySignupByUserRestrictCount(uid, activityId int) (count int, err e
 
 //获取某一活动已经报名的数量
 func GetActivitySignupSuccessCount(activityId int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0 AND fail_type = 0 AND activity_id=? `
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0 AND do_fail_type = 0 AND activity_id=? `
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return

models/company.go

@@ -89,6 +89,21 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 	return
 }
 
+func GetCompanyPermissionByUser(companyId int) (permission string, err error) {
+	sql := ` SELECT GROUP_CONCAT(DISTINCT b.remark  ORDER BY b.sort ASC SEPARATOR ',') AS permission
+			FROM company_report_permission AS a
+			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
+			WHERE  a.company_id=?
+			AND c.is_suspend=0
+            AND b.cygx_auth=1
+			AND c.status IN('正式','试用','永续')
+			AND a.status IN('正式','试用','永续') `
+	o := orm.NewOrm()
+	err = o.Raw(sql, companyId).QueryRow(&permission)
+	return
+}
+
 func GetCompanyPermissionByName(name string) (permission string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name  ORDER BY b.sort ASC SEPARATOR '/') AS permission
 			FROM company_report_permission AS a

models/report.go

@@ -93,6 +93,7 @@ func IndustrialToArticleCategory(industrialManagementId, chartPermissionId int)
 	INNER JOIN cygx_article AS art ON art.category_id = map.category_id
 	INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = art.article_id
 	WHERE map.report_type = 2
+	AND map.is_report = 1
     AND art.is_report = 1
     AND art.publish_status = 1
 	AND man_g.industrial_management_id =?

services/task.go

@@ -38,7 +38,7 @@ func Task() {
 		task.AddTask("sendEmailFileForAskMsg", sendEmailFileForAskMsg)
 
 		sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
-		task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
+		task.AddTask("白名单发送", sendEmailUserWhiteListChange)
 	}
 
 	if utils.IsTask {
@@ -56,6 +56,7 @@ func Task() {
 		activityAttendanceDetail := task.NewTask("activityAttendanceDetail", "0 00 3 * * *", ActivityAttendanceDetail) //同步进门财经的路演信息
 		task.AddTask("sendEmailUserWhiteListChange", activityAttendanceDetail)
 	}
+
 	//ActivityAttendanceDetail()
 	//SynchronizationArthistory()//同步原有的阅读记录
 	//GetAddpArticle() //同步日度点评数据

services/user.go

@@ -877,6 +877,8 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	if len(listFrozen) > 0 {
 		sendResult2 = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
 	}
+	fmt.Println(sendResult2)
+	fmt.Println(sendResult)
 	os.Remove(downLoadnFilePaths)
 	//更新名单表
 	if sendResult {