fix

controllers/ppt_v2_group.go

@@ -24,7 +24,7 @@ func (this *PptV2GroupController) GroupList() {
 	}()
 	IsNewPpt, _ := this.GetInt("IsNewPpt")
 	//data, err := ppt.GetGroupsByAdminId(IsNewPpt, this.SysUser.AdminId)
-	data, err := ppt.GetGroupsByAdminIdV2(IsNewPpt, this.SysUser.AdminId)
+	data, err := ppt.GetGroupsByAdminIdV2(IsNewPpt, this.SysUser.AdminId, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return

controllers/report_approve/report_approve_flow.go

@@ -720,19 +720,36 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 		return
 	}
 
-	resp = append(resp, &report_approve.ReportClassifyTreeItem{
-		ClassifyId:   report_approve.FlowReportTypeChinese,
-		ClassifyName: "研报列表",
-		Children:     cnTree,
-	}, &report_approve.ReportClassifyTreeItem{
-		ClassifyId:   report_approve.FlowReportTypeEnglish,
-		ClassifyName: "英文研报",
-		Children:     enTree,
-	}, &report_approve.ReportClassifyTreeItem{
-		ClassifyId:   report_approve.FlowReportTypeSmart,
-		ClassifyName: "智能研报",
-		Children:     smartTree,
-	})
+	if this.Lang == utils.EnLangVersion {
+		resp = append(resp, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeChinese,
+			ClassifyName: "Report list",
+			Children:     cnTree,
+		}, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeEnglish,
+			ClassifyName: "English Report",
+			Children:     enTree,
+		}, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeSmart,
+			ClassifyName: "Smart Report",
+			Children:     smartTree,
+		})
+	} else {
+		resp = append(resp, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeChinese,
+			ClassifyName: "研报列表",
+			Children:     cnTree,
+		}, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeEnglish,
+			ClassifyName: "英文研报",
+			Children:     enTree,
+		}, &report_approve.ReportClassifyTreeItem{
+			ClassifyId:   report_approve.FlowReportTypeSmart,
+			ClassifyName: "智能研报",
+			Children:     smartTree,
+		})
+	}
+
 
 	br.Data = resp
 	br.Ret = 200

controllers/target.go

@@ -777,6 +777,7 @@ func (this *TargetCommonController) TemplateDownload() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+
 	this.Ctx.Output.Download("./static/数据导入模板.xlsx", "数据导入模板.xlsx")
 	br.Ret = 200
 	br.Success = true

controllers/trade_analysis/trade_analysis.go

@@ -28,7 +28,7 @@ func (c *TradeAnalysisController) GetClassifyName() {
 		c.ServeJSON()
 	}()
 	//userinfo := userService.GetInfoByClaims(c)
-	list, err, errMsg := trade_analysis.GetClassifyName()
+	list, err, errMsg := trade_analysis.GetClassifyName(c.Lang)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = "获取失败, ErrMsg: " + err.Error()

services/data/trade_analysis/trade_analysis.go

@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error, errMsg string) {
+func GetClassifyName(lang string) (list trade_analysis.TradeClassifyNameListSort, err error, errMsg string) {
 	//定义交易所
 	exchanges := map[string]string{
 		"zhengzhou": "郑商所",
@@ -18,6 +18,13 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 		"cffex":     "中金所",
 		"ine":       "上期能源",
 	}
+	exchangesEn := map[string]string{
+		"郑商所":  "Zhengzhou ComEx",
+		"大商所":  "Dalian ComEx",
+		"上期所":  "SH Intl Energy Ex",
+		"中金所":  "China Fin Futures Ex",
+		"上期能源": "SH Energy Ex",
+	}
 	exchangesSortMap := map[string]int{
 		"zhengzhou": 1,
 		"dalian":    2,
@@ -71,6 +78,9 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 			Sort:     exchangesSortMap[k],
 			CurrDate: currDate,
 		}
+		if lang == utils.EnLangVersion {
+			tmp.Exchange = exchangesEn[v]
+		}
 		nameList, ok := classifyExchangeMap[k]
 		if !ok {
 			err = fmt.Errorf("查询交易所分类信息失败")

services/ppt/ppt_group.go

@@ -1178,21 +1178,38 @@ func InitPptGroup() (err error) {
 // GetGroupsByAdminIdV2 查询ppt目录列表
 // @Author roc
 // @Time 2022-08-29 15:22:20
-func GetGroupsByAdminIdV2(IsNewPpt, adminId int) (ret models.RespGroupList, err error) {
+func GetGroupsByAdminIdV2(IsNewPpt, adminId int, lang string) (ret models.RespGroupList, err error) {
 	myPptList := make([]*models.RespGroupPptNameListItem, 0)
 	otherPptList := make([]*models.RespGroupPptNameListItem, 0)
-	grantList := []models.RespGroupListItem{
-		{
-			GroupId:   1,
-			GroupName: "我共享的",
-			PptList:   myPptList,
-		},
-		{
-			GroupId:   2,
-			GroupName: "收到共享",
-			PptList:   otherPptList,
-		},
+	grantList := []models.RespGroupListItem{}
+	if lang == utils.EnLangVersion {
+		grantList = append(grantList, []models.RespGroupListItem{
+			{
+				GroupId:   1,
+				GroupName: "My shared",
+				PptList:   myPptList,
+			},
+			{
+				GroupId:   2,
+				GroupName: "Received shared",
+				PptList:   otherPptList,
+			},
+		}...)
+	} else {
+		grantList = append(grantList, []models.RespGroupListItem{
+			{
+				GroupId:   1,
+				GroupName: "我共享的",
+				PptList:   myPptList,
+			},
+			{
+				GroupId:   2,
+				GroupName: "收到共享",
+				PptList:   otherPptList,
+			},
+		}...)
 	}
+
 	ret.PublicList = make([]*models.RespGroupListItem, 0)
 	ret.PrivateList = make([]*models.RespGroupListItem, 0)
 	ret.GrantList = grantList