no message

models/activity_special_trip_bill.go

@@ -70,11 +70,9 @@ type CygxActivitySpecialTripBillList struct {
 func GetCygxActivitySpecialTripBillList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			b.*,
-			c.chart_permission_name 
+			b.*
 		FROM
 			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
 		WHERE
 			1 = 1` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&item)
@@ -146,9 +144,9 @@ func AddCygxActivitySpecialTripBillMulti(items []*CygxActivitySpecialTripBill) (
 }
 
 type SpecialBillInitReduce struct {
-	CreateTime       time.Time
-	CompanyId          int
-	CompanyName        string
+	CreateTime  time.Time
+	CompanyId   int
+	CompanyName string
 }
 
 func GetActivitySecialTirpBillForReduce() (item []*SpecialBillInitReduce, err error) {
@@ -182,10 +180,9 @@ func GetCygxActivitySpecialTripBillByCompanyIdForInit(companyId int) (item []*Cy
 	return
 }
 
-
 func UpdateCygxActivitySpecialTripBillByCompanyIdForInit(total string, id int) (err error) {
 	o := orm.NewOrm()
 	sql := ` UPDATE cygx_activity_special_trip_bill SET total=? WHERE id = ?  `
-	_, err = o.Raw(sql,total, id).Exec()
+	_, err = o.Raw(sql, total, id).Exec()
 	return
 }

models/chart_permission.go

@@ -28,6 +28,13 @@ func GetChartPermissionAll(condition string) (items []*ChartPermission, err erro
 	return
 }
 
+func GetChartPermissionListRai() (items []*ChartPermission, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := `SELECT * FROM chart_permission WHERE product_id=2  ORDER BY sort ASC `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 func GetCategoryId(chartPermissionId int) (category_id string, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT GROUP_CONCAT(a.category_id) AS category_id 

services/activity_special.go

@@ -1337,6 +1337,15 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
 			return
 		}
+
+		PermissionNameMap, e := GetPermissionNameMap()
+		if e != nil {
+			err = errors.New("GetPermissionNameMap, Err: " + e.Error())
+			return
+		}
+		for k, v := range listTripBill {
+			listTripBill[k].ChartPermissionName = PermissionNameMap[v.ChartPermissionId]
+		}
 		// 获取继承点数
 		inheritList, e := models.GetCygxActivitySpecialInheritPointsByCompanyId(companyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {

services/company_permission.go

@@ -286,3 +286,18 @@ func GetUserHasPermissionSimple(user *models.WxUserItem) (hasPermission int, err
 	}
 	return
 }
+
+// GetPermissionNameMap 权限名称与权限ID的map
+func GetPermissionNameMap() (mapItem map[int]string, err error) {
+	list, e := models.GetChartPermissionListRai()
+	if e != nil {
+		err = e
+		return
+	}
+	mapPermissionName := make(map[int]string)
+	for _, v := range list {
+		mapPermissionName[v.ChartPermissionId] = v.PermissionName
+	}
+	mapItem = mapPermissionName
+	return
+}