Merge branch 'cygx_10.9.1'

controllers/company.go

@@ -9252,8 +9252,8 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 	pars = append(pars, companyId)
 
 	//查询当年的数据
-	condition += ` AND b.create_time >= ?  `
-	pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
+	//condition += ` AND b.create_time >= ?  `
+	//pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
 	list, err := cygx.GetCygxActivitySpecialTripBillDetailListAll(condition, pars)
 	if err != nil {
 		br.Msg = "获取任务信息失败"
@@ -9286,9 +9286,9 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		if v.ActivityId == 0 {
 			item.Content = v.Content
 		} else {
-			if v.DoType == 1 && v.Way != 4 {
+			if v.DoType == 1 && v.Way != 4 && v.Way != 3 {
 				item.Content = item.ActivityName + "--报名"
-			} else if v.DoType == 2 && v.Way != 4 {
+			} else if v.DoType == 2 && v.Way != 4 && v.Way != 3  {
 				item.Content = item.ActivityName + "--取消报名"
 			} else if v.Way == 4 {
 				item.Content = item.ActivityName + "--活动取消"

services/cygx/activity_special.go

@@ -238,8 +238,8 @@ func GetSpecialSurplusByCompany(companyId int) (specialSurplus string, err error
 	pars = append(pars, companyId)
 
 	//查询当年的数据
-	condition += ` AND b.create_time >= ?  `
-	pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
+	//condition += ` AND b.create_time >= ?  `
+	//pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
 	listTripBill, e := cygx.GetCygxActivitySpecialTripBillList(condition, pars)
 	if e != nil {
 		err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
@@ -434,8 +434,8 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 		pars = append(pars, companyId)
 
 		//查询当年的数据
-		condition += ` AND b.create_time >= ?  `
-		pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
+		//condition += ` AND b.create_time >= ?  `
+		//pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
 		listTripBill, e := cygx.GetCygxActivitySpecialTripBillList(condition, pars)
 		if e != nil {
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())