Merge branch 'cygx_10.9.1' into debug

controllers/company.go

@@ -9278,7 +9278,7 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 			CompanyName:         v.CompanyName,
 			RealName:            v.RealName,
 			BillDetailed:        v.BillDetailed,
-			ActivityName:        v.ActivityName,
+			ActivityName:        v.ResearchTheme,
 			ChartPermissionId:   v.ChartPermissionId,
 			ChartPermissionName: v.ChartPermissionName,
 		}
@@ -9297,8 +9297,9 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		if userType == 2 {
 			if i== 0{
 				item.Total += strconv.Itoa(tripRemaining) + "次"
+			} else {
+				item.Total += strconv.Itoa(tripRemaining-v.BillDetailed) + "次"
 			}
-			item.Total += strconv.Itoa(tripRemaining-v.BillDetailed) + "次"
 		} else {
 			for k, num := range mapChartName {
 				if num > 0 {

models/cygx/activity_special_trip_bill.go

@@ -113,7 +113,7 @@ type CygxActivitySpecialTripBillDetailList struct {
 	Id                  int       `orm:"column(id);pk"`
 	UserId              int       `description:"用户id,多个用,隔开"`
 	ActivityId          int       `description:"活动ID"`
-	ActivityName        string    `description:"活动标题"`
+	ResearchTheme       string    `description:"调研主题"`
 	CreateTime          time.Time `description:"创建时间"`
 	Mobile              string    `description:"手机号"`
 	Email               string    `description:"邮箱号"`
@@ -135,12 +135,12 @@ func GetCygxActivitySpecialTripBillDetailList(condition string, pars []interface
 	o := orm.NewOrm()
 	sql := `SELECT
 			b.*,
-			a.activity_name,
+			a.research_theme,
 			c.chart_permission_name 
 		FROM
 			cygx_activity_special_trip_bill AS b
 			INNER JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
-			INNER JOIN cygx_activity AS a ON a.activity_id = b.activity_id
+			INNER JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
 		WHERE
 			1 = 1` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&item)
@@ -169,12 +169,12 @@ func GetCygxActivitySpecialTripBillDetailListAll(condition string, pars []interf
 	o := orm.NewOrm()
 	sql := `SELECT
 			b.*,
-			a.activity_name,
+			a.research_theme,
 			c.chart_permission_name 
 		FROM
 			cygx_activity_special_trip_bill AS b
 			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
-			LEFT JOIN cygx_activity AS a ON a.activity_id = b.activity_id
+			LEFT JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
 		WHERE
 			1 = 1` + condition