Browse Source

更新

master
huangjiajun 1 month ago
parent
commit
9894f3372d
3 changed files with 7 additions and 7 deletions
  1. +4
    -4
      app/svc/svc_data_center.go
  2. +2
    -2
      app/svc/svc_index.go
  3. +1
    -1
      go.mod

+ 4
- 4
app/svc/svc_data_center.go View File

@@ -27,7 +27,7 @@ func DataCenterRecordTotal(c *gin.Context, req md.DataCenterTableReq) md.DataCen
where %s where %s
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
if req.AppId != "" || req.Platform != "" { if req.AppId != "" || req.Platform != "" {
where += " and app_id in(" + appId + ")" where += " and app_id in(" + appId + ")"
} }
@@ -164,7 +164,7 @@ func DataCenterCommissionRecordTotal(c *gin.Context, req md.DataCenterTableReq)
where %s where %s
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid")
where := "is_generate_report=1 and uuid=" + c.GetString("mid")
if req.AppId != "" || req.Platform != "" { if req.AppId != "" || req.Platform != "" {
where += " and app_id in(" + appId + ")" where += " and app_id in(" + appId + ")"
} }
@@ -400,7 +400,7 @@ func comm(c *gin.Context, isTotal int, req md.DataCenterRecordReq) ([]map[string
where %s %s where %s %s
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
if req.AppId != "" || req.Platform != "" { if req.AppId != "" || req.Platform != "" {
where += " and app_id in(" + appId + ")" where += " and app_id in(" + appId + ")"
} }
@@ -496,7 +496,7 @@ func commAgent(c *gin.Context, isTotal int, req md.DataCenterRecordReq) ([]map[s
where %s %s where %s %s
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
if req.AppId != "" || req.Platform != "" { if req.AppId != "" || req.Platform != "" {
where += " and app_id in(" + appId + ")" where += " and app_id in(" + appId + ")"
} }


+ 2
- 2
app/svc/svc_index.go View File

@@ -141,7 +141,7 @@ func commTotal(c *gin.Context, startDate, endDate string) []map[string]string {
where %s where %s
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
if startDate != "" { if startDate != "" {
where += " and date>='" + startDate + "'" where += " and date>='" + startDate + "'"
} }
@@ -198,7 +198,7 @@ func commTotalByApp(c *gin.Context, req md.IndexAppListReq, appId []string) []ma
where %s group by app_id order by %s,id asc limit 20 where %s group by app_id order by %s,id asc limit 20
` `
mediumId := GetAgentMediumId(c) mediumId := GetAgentMediumId(c)
where := "uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id in(" + mediumId + ")"
if req.StartDate != "" { if req.StartDate != "" {
where += " and date>='" + req.StartDate + "'" where += " and date>='" + req.StartDate + "'"
} }


+ 1
- 1
go.mod View File

@@ -37,7 +37,7 @@ require (
) )


require ( require (
code.fnuoos.com/zhimeng/model.git v0.0.3-0.20240913063657-cd3094cf9822
code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241009031730-6c5d31eb7458
github.com/360EntSecGroup-Skylar/excelize v1.4.1 github.com/360EntSecGroup-Skylar/excelize v1.4.1
) )




Loading…
Cancel
Save