产业资源包去掉模糊搜索

controllers/article.go

@@ -1,16 +1,7 @@
 package controllers
 
 import (
-	//"bufio"
-	//"io"
-	//"path"
-	//"rdluck_tools/http"
-
 	"bufio"
-	"io"
-	"io/ioutil"
-
-	//"bufio"
 	"encoding/json"
 	"fmt"
 	"github.com/medivhzhan/weapp/v2"
@@ -18,17 +9,11 @@ import (
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
 	"html"
-	"rdluck_tools/http"
-
-	//"rdluck_tools/http"
-
-	//"io"
+	"io"
+	"io/ioutil"
 	nhttp "net/http"
 	"os"
-	//"rdluck_tools/http"
-
-	//"path"
-	//"rdluck_tools/http"
+	"rdluck_tools/http"
 	"regexp"
 	"strconv"
 	"strings"

controllers/report.go

@@ -123,60 +123,45 @@ func (this *ReportController) IndustryList() {
 		condition += ` AND is_deep_label = ` + isDeepLabel
 	}
 	if keyWord != "" {
-		keyWordArr, err := services.GetIndustryMapNameSliceV2(keyWord)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		var conditionkeyWord string
-		conditionkeyWord += ` subject_names LIKE '%` + keyWord + `%'`
-		keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
-		keyWordLen := len(keyWordArr)
-		if keyWordLen <= 0 {
-			keyWordArr = append(keyWordArr, keyWord)
-			keyWordLen = len(keyWordArr)
-		}
-		for _, v := range keyWordArr {
-			conditionkeyWord += ` OR subject_names LIKE '%` + v + `%'`
-		}
-		industrialManagementIds, err := models.GetIndustrialManagementIdsBykeyWord(conditionkeyWord)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-			return
-		}
-		if industrialManagementIds == "" {
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "获取成功"
-			br.Data = resp
-			return
-		}
-		condition += ` AND man.industrial_management_id IN (` + industrialManagementIds + `)`
+		//keyWordArr, err := services.GetIndustryMapNameSliceV2(keyWord)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		//	return
+		//}
+		//var conditionkeyWord string
+		//conditionkeyWord += ` subject_names LIKE '%` + keyWord + `%'`
+		//keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
+		//keyWordLen := len(keyWordArr)
+		//if keyWordLen <= 0 {
+		//	keyWordArr = append(keyWordArr, keyWord)
+		//	keyWordLen = len(keyWordArr)
+		//}
+		//for _, v := range keyWordArr {
+		//	conditionkeyWord += ` OR subject_names LIKE '%` + v + `%'`
+		//}
+		//industrialManagementIds, err := models.GetIndustrialManagementIdsBykeyWord(conditionkeyWord)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+		//	return
+		//}
+		//if industrialManagementIds == "" {
+		//	br.Ret = 200
+		//	br.Success = true
+		//	br.Msg = "获取成功"
+		//	br.Data = resp
+		//	return
+		//}
+		//condition += ` AND man.industrial_management_id IN (` + industrialManagementIds + `)`
+		condition += `subject_names LIKE '%` + keyWord + `%'`
 	}
 	var sqlChartPermissionId string
 	if ChartPermissionId > 0 {
 		sqlChartPermissionId += ` AND man_g.industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industrial_management WHERE chart_permission_id = ` + strconv.Itoa(ChartPermissionId) + ` ) `
 		condition += ` AND man.chart_permission_id IN (` + strconv.Itoa(ChartPermissionId) + `)`
 	}
-
-	//var total int
 	var list []*models.IndustrialManagement
-	//totalTopList, errTop := models.GetIndustrialManagemenCountTop(sqlChartPermissionId, uid, condition)
-	//totalTop := len(totalTopList)
-	//if errTop != nil {
-	//	br.Msg = "获取信息失败"
-	//	br.ErrMsg = "获取品种信息失败,Err:" + errTop.Error()
-	//	return
-	//}
-	//totalNoTopList, errNoTop := models.GetIndustrialManagemenCountNoTop(sqlChartPermissionId, uid, condition)
-	//totalNoTop := len(totalNoTopList)
-	//if errNoTop != nil {
-	//	br.Msg = "获取信息失败"
-	//	br.ErrMsg = "获取品种信息失败,Err:" + errNoTop.Error()
-	//	return
-	//}
 	total, err := models.GetIndustrialManagementAllCount(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -192,45 +177,6 @@ func (this *ReportController) IndustryList() {
 	} else {
 		orderSrt = "man.recommended_index DESC,update_time DESC"
 	}
-	//全部都是置顶
-	//if totalTop >= currentIndex*pageSize {
-	//	listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
-	//	for k, _ := range listTop {
-	//		listTop[k].IsTop = true
-	//	}
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	list = listTop
-	//} else if totalTop < (currentIndex-1)*pageSize { //全部都是不置顶
-	//	listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, startSize-totalTop, pageSize)
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	list = listNoTop
-	//} else { //部分置顶，部分不置顶
-	//	listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	for k, _ := range listTop {
-	//		listTop[k].IsTop = true
-	//	}
-	//	listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, 0, pageSize-len(listTop))
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	list = append(listTop, listNoTop...)
-	//}
-
 	if ChartPermissionId == 0 {
 		ChartPermissionId = 20
 	}
@@ -248,13 +194,6 @@ func (this *ReportController) IndustryList() {
 		return
 	}
 	for k, v := range list {
-		//var analystStr string
-		//analystList, err := models.GetIndustrialAnalystAll(v.IndustrialManagementId)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-		//	return
-		//}
 		industrialSubjectList, err := models.GetIndustrialSubjectAll(v.IndustrialManagementId)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -262,13 +201,6 @@ func (this *ReportController) IndustryList() {
 			return
 		}
 		list[k].IndustrialSubjectList = industrialSubjectList
-		//if len(analystList) > 0 {
-		//	for _, v2 := range analystList {
-		//		analystStr += v2.AnalystName + "/"
-		//	}
-		//	analystStr = strings.TrimRight(analystStr, "/")
-		//}
-		//list[k].Analyst = analystStr
 		list[k].LayoutTime = utils.TimeRemoveHms(v.LayoutTime)
 		newArtinfo, err := models.GetIndustrialNewArticleDetail(v.IndustrialManagementId)
 		if err != nil {

models/activity_help_ask.go

@@ -34,6 +34,7 @@ type CygxAskList struct {
 	Title              string `description:"标题"`
 	Content            string `description:"内容"`
 	AskType            string `description:"类型 Activity 活动 、Report 文章报告"`
+	CreateTime         string `description:"创建时间"`
 }
 
 type CygxAskListResp struct {