Browse Source

no message

xingzai 7 months ago
parent
commit
00bbb510bf
1 changed files with 15 additions and 13 deletions
  1. 15 13
      controllers/cygx/rai_serve.go

+ 15 - 13
controllers/cygx/rai_serve.go

@@ -595,12 +595,12 @@ func (this *RaiServeCoAntroller) CoverageRate() {
 	for k, v := range listWeekBill {
 	for k, v := range listWeekBill {
 		mapWeek[k] = v.ServeCount
 		mapWeek[k] = v.ServeCount
 	}
 	}
-	//fmt.Sprintf(mapWeek[1])
+
 	resp := new(cygx.RaiServeCoverageRateResp)
 	resp := new(cygx.RaiServeCoverageRateResp)
-	//resp.ThisWeekAmount = fmt.Sprintf(,"%")
-	resp.LastWeekAmount = "33%"
-	resp.TwoWeekAmount = "44%"
-	resp.ThreeWeekAmount = "55%"
+	resp.ThisWeekAmount = strconv.Itoa(int(mapWeek[0])) + "%"
+	resp.LastWeekAmount = strconv.Itoa(int(mapWeek[1])) + "%"
+	resp.TwoWeekAmount = strconv.Itoa(int(mapWeek[2])) + "%"
+	resp.ThreeWeekAmount = strconv.Itoa(int(mapWeek[3])) + "%"
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Msg = "获取成功"
@@ -652,19 +652,21 @@ func (this *RaiServeCoAntroller) BillList() {
 	}
 	}
 	var condition string
 	var condition string
 	var pars []interface{}
 	var pars []interface{}
-	condition = " AND  company_id = ? "
+	var err error
+
+	condition, pars, err = getServeBillTag(tagType, tagId) // 标签ID搜索语句处理
+	if err != nil {
+		br.Msg = "获取信息失败!"
+		br.ErrMsg = "获取用户信息失败-getServeBillTag!Err:" + err.Error()
+		return
+	}
+
+	condition += " AND  company_id = ? "
 	pars = append(pars, companyId)
 	pars = append(pars, companyId)
 	if serveTypeId > 0 {
 	if serveTypeId > 0 {
 		condition += " AND  serve_type_id = ? "
 		condition += " AND  serve_type_id = ? "
 		pars = append(pars, serveTypeId)
 		pars = append(pars, serveTypeId)
 	}
 	}
-	switch tagType {
-	case 1:
-		fmt.Println(tagId)
-	case 2:
-	case 3:
-
-	}
 
 
 	total, err := cygx.GetCygxRaiServeBillCount(condition, pars)
 	total, err := cygx.GetCygxRaiServeBillCount(condition, pars)
 	if err != nil {
 	if err != nil {