|
@@ -2317,8 +2317,14 @@ func (this *MobileReportController) ZhouqiTacticsList() {
|
|
|
}
|
|
|
startSize = paging.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
+ detail, err := models.GetCygxZhouqiArticleMapInfoById(categoryId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
var total int
|
|
|
- var err error
|
|
|
+ //var err error
|
|
|
resp := new(models.TacticsListResp)
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
list := make([]*models.ArticleListResp, 0)
|
|
@@ -2334,20 +2340,27 @@ func (this *MobileReportController) ZhouqiTacticsList() {
|
|
|
if v.MatchTypeName != "" {
|
|
|
matchTypeName = append(matchTypeName, v.MatchTypeName)
|
|
|
}
|
|
|
-
|
|
|
if v.SeriesName != "" {
|
|
|
seriesName = append(seriesName, v.SeriesName)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- var condition string
|
|
|
- //var pars []interface{}
|
|
|
- if len(seriesName) == 0 {
|
|
|
- condition = " AND field_name IN ('" + strings.Join(matchTypeName, "','") + "')"
|
|
|
- } else {
|
|
|
- condition = " AND ( field_name IN ('" + strings.Join(matchTypeName, "','") + "') OR series_name IN ('" + strings.Join(seriesName, "','") + "') )"
|
|
|
+ var conditionOr string
|
|
|
+ if detail.FiccReportId != "" {
|
|
|
+ conditionOr = " OR art.report_id IN (" + detail.FiccReportId + ")" // 手动配置报告展示逻辑处理
|
|
|
+ }
|
|
|
+ if len(seriesName) > 0 {
|
|
|
+ conditionOr += " OR series_name IN ('" + strings.Join(seriesName, "','") + "') "
|
|
|
}
|
|
|
|
|
|
+ var condition string
|
|
|
+ //var pars []interface{}
|
|
|
+ //if len(seriesName) == 0 {
|
|
|
+ // condition = " AND field_name IN ('" + strings.Join(matchTypeName, "','") + "')"
|
|
|
+ //} else {
|
|
|
+ // condition = " AND ( field_name IN ('" + strings.Join(matchTypeName, "','") + "') OR series_name IN ('" + strings.Join(seriesName, "','") + "') )"
|
|
|
+ //}
|
|
|
+ condition = " AND ( field_name IN ('" + strings.Join(matchTypeName, "','") + "') " + conditionOr + " ) "
|
|
|
list, total, err = models.GetReportAndproductIndustrylListimgZhouqi(condition, startSize, pageSize)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|