Browse Source

fix:列表页的供应商停更字段

Roc 7 months ago
parent
commit
f136ec4ca9

+ 30 - 0
controllers/data_manage/edb_info.go

@@ -5398,12 +5398,42 @@ func (this *EdbInfoController) EdbChartList() {
 				return
 			}
 
+			issSupplierStopIndexCodeMap := make(map[string]bool)
+			{
+				tmpEdbCodeList := make([]string, 0)
+				for _, v := range list {
+					if v.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+						tmpEdbCodeList = append(tmpEdbCodeList, v.EdbCode)
+					}
+				}
+				if len(tmpEdbCodeList) > 0 {
+					notIsSupplierStopIndexList, e := data_manage.GetNotIsSupplierStopIndexByCodeList(tmpEdbCodeList, 1)
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取数据失败,Err:" + e.Error()
+						return
+					}
+
+					// 已被供应商暂停的指标编码
+					for _, v := range notIsSupplierStopIndexList {
+						issSupplierStopIndexCodeMap[v.IndexCode] = true
+					}
+				}
+			}
+
 			for _, v := range list {
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
 
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
 				}
+
+				// 供应商停用
+				if v.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+					if _, ok := issSupplierStopIndexCodeMap[v.EdbCode]; ok {
+						v.IsSupplierStop = 1
+					}
+				}
 			}
 		}
 

+ 1 - 1
controllers/data_manage/edb_info_refresh.go

@@ -731,7 +731,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 		for _, v := range edbList {
 			tmpEdbCodeList = append(tmpEdbCodeList, v.EdbCode)
 		}
-		notIsSupplierStopIndexList, e := data_manage.GetNotIsSupplierStopIndexByCodeList(tmpEdbCodeList)
+		notIsSupplierStopIndexList, e := data_manage.GetNotIsSupplierStopIndexByCodeList(tmpEdbCodeList, 0)
 		if e != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + e.Error()

+ 4 - 3
models/data_manage/mysteel_chemical_index.go

@@ -706,17 +706,18 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int,
 // @author: Roc
 // @datetime 2024-08-28 18:15:03
 // @param codeList []string
+// @param isStop int
 // @return items []*BaseFromMysteelChemicalIndex
 // @return err error
-func GetNotIsSupplierStopIndexByCodeList(codeList []string) (items []*BaseFromMysteelChemicalIndex, err error) {
+func GetNotIsSupplierStopIndexByCodeList(codeList []string, isStop int) (items []*BaseFromMysteelChemicalIndex, err error) {
 	num := len(codeList)
 	if num <= 0 {
 		return
 	}
 
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE is_supplier_stop = 0 AND index_code in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, codeList).QueryRows(&items)
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE is_supplier_stop = ? AND index_code in (` + utils.GetOrmInReplace(num) + `) `
+	_, err = o.Raw(sql, isStop, codeList).QueryRows(&items)
 
 	return
 }