Merge branch 'ETA_1.8.0' into debug

controllers/english_report/report.go

@@ -176,7 +176,7 @@ func (this *EnglishReportController) Edit() {
 		return
 	}
 
-	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName)
+	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return
@@ -569,7 +569,11 @@ func (this *EnglishReportController) ListReport() {
 				editor = adminMap[opUserId]
 			}
 			ret.Status = 1
-			ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+			if this.Lang == utils.EnLangVersion {
+				ret.Msg = fmt.Sprintf("%s is currently editing the report", editor)
+			} else {
+				ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+			}
 			ret.Editor = editor
 		}
 		if ret.Status == 0 {
@@ -942,7 +946,7 @@ func (this *EnglishReportController) SaveReportContent() {
 		br.Msg = "请输入报告ID"
 		return
 	}
-	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName)
+	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return
@@ -1137,7 +1141,7 @@ func (this *EnglishReportController) MarkEditStatus() {
 		return
 	}
 	//更新标记key
-	data, err := services.UpdateEnReportEditMark(req.ReportId, sysUser.AdminId, req.Status, sysUser.RealName)
+	data, err := services.UpdateEnReportEditMark(req.ReportId, sysUser.AdminId, req.Status, sysUser.RealName, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return
@@ -1216,7 +1220,7 @@ func (this *EnglishReportController) EditPolicy() {
 		br.Msg = "报告已发布不允许编辑"
 		return
 	}
-	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName)
+	markStatus, err := services.UpdateEnReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return

controllers/report.go

@@ -219,7 +219,7 @@ func (this *ReportController) ListReport() {
 		if item.ClassifyNameFirst == "周报" || item.ClassifyNameFirst == "晨报" {
 			item.CanEdit = true
 		} else {
-			markStatus, err := services.UpdateReportEditMark(item.Id, this.SysUser.AdminId, 2, this.SysUser.RealName)
+			markStatus, err := services.UpdateReportEditMark(item.Id, this.SysUser.AdminId, 2, this.SysUser.RealName, this.Lang)
 			if err != nil {
 				br.Msg = "查询标记状态失败"
 				br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
@@ -693,7 +693,7 @@ func (this *ReportController) Edit() {
 	}
 
 	//更新标记key
-	markStatus, err := services.UpdateReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName)
+	markStatus, err := services.UpdateReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang
 	if err != nil {
 		br.Msg = err.Error()
 		return
@@ -1208,7 +1208,7 @@ func (this *ReportController) SaveReportContent() {
 			return
 		}
 
-		markStatus, err := services.UpdateReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName)
+		markStatus, err := services.UpdateReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang)
 		if err != nil {
 			br.Msg = err.Error()
 			return
@@ -3262,7 +3262,7 @@ func (this *ReportController) MarkEditStatus() {
 		return
 	}
 	//更新标记key
-	data, err := services.UpdateReportEditMark(req.ReportId, sysUser.AdminId, req.Status, sysUser.RealName)
+	data, err := services.UpdateReportEditMark(req.ReportId, sysUser.AdminId, req.Status, sysUser.RealName, this.Lang)
 	if err != nil {
 		br.Msg = err.Error()
 		return

controllers/report_approve/report_approve_flow.go

@@ -411,7 +411,7 @@ func (this *ReportApproveFlowController) Edit() {
 			return
 		}
 		if !checkOk {
-			br.Msg = "当前有未走完流程的报告, 请走完流程后再做变更!"
+			br.Msg = "当前有未走完流程的报告, 请走完流程后再做变更"
 			return
 		}
 	}

controllers/smart_report/smart_report.go

@@ -817,7 +817,7 @@ func (this *SmartReportController) SaveContent() {
 	for _, ad := range admins {
 		adminIdName[ad.AdminId] = ad.RealName
 	}
-	editing, e := services.UpdateSmartReportEditing(req.SmartReportId, 1, sysUser.AdminId, sysUser.RealName, adminIdName)
+	editing, e := services.UpdateSmartReportEditing(req.SmartReportId, 1, sysUser.AdminId, sysUser.RealName, adminIdName, this.Lang)
 	if e != nil {
 		br.Msg = e.Error()
 		return

services/english_report.go

@@ -662,7 +662,7 @@ func CreateEnglishReportIndex() {
 
 // UpdateEnReportEditMark 更新英文研报当前更新状态
 // status 枚举值 1：编辑中，0：完成编辑, 2：只做查询
-func UpdateEnReportEditMark(reportId, nowUserId, status int, nowUserName string) (ret models.MarkReportResp, err error) {
+func UpdateEnReportEditMark(reportId, nowUserId, status int, nowUserName, lang string) (ret models.MarkReportResp, err error) {
 	//更新标记key
 	key := fmt.Sprint(`crm:enReport:edit:`, reportId)
 	opUserId, e := utils.Rc.RedisInt(key)
@@ -689,7 +689,11 @@ func UpdateEnReportEditMark(reportId, nowUserId, status int, nowUserName string)
 		}
 
 		ret.Status = 1
-		ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		if lang == utils.EnLangVersion {
+			ret.Msg = fmt.Sprintf("%s is currently editing the report", editor)
+		} else {
+			ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		}
 		ret.Editor = editor
 		return
 	}

services/report.go

@@ -1212,7 +1212,7 @@ func GetReportContentSubWithoutIframe(content string) (contentSub string, err er
 
 // UpdateReportEditMark 更新研报当前更新状态
 // status 枚举值 1：编辑中，0：完成编辑, 2：只做查询
-func UpdateReportEditMark(reportId, nowUserId, status int, nowUserName string) (ret models.MarkReportResp, err error) {
+func UpdateReportEditMark(reportId, nowUserId, status int, nowUserName, lang string) (ret models.MarkReportResp, err error) {
 	//更新标记key
 	key := fmt.Sprint(`crm:report:edit:`, reportId)
 	ret.Status = 0
@@ -1259,7 +1259,11 @@ func UpdateReportEditMark(reportId, nowUserId, status int, nowUserName string) (
 		}
 
 		ret.Status = 1
-		ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		if lang == utils.EnLangVersion {
+			ret.Msg = fmt.Sprintf("%s is currently editing the report", editor)
+		} else {
+			ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		}
 		ret.Editor = editor
 		return
 	}

services/smart_report.go

@@ -47,7 +47,7 @@ func SmartReportBuildVideoAndUpdate(item *smart_report.SmartReport) {
 
 // UpdateSmartReportEditing 更新研报当前更新状态
 // status 枚举值 1：编辑中，0：完成编辑, 2：只做查询
-func UpdateSmartReportEditing(reportId, status, thisUserId int, thisUserName string, adminIdName map[int]string) (ret models.MarkReportResp, err error) {
+func UpdateSmartReportEditing(reportId, status, thisUserId int, thisUserName string, adminIdName map[int]string, lang string) (ret models.MarkReportResp, err error) {
 	key := fmt.Sprint(utils.CACHE_SMART_REPORT_EDITING, reportId)
 	ret.Status = 0
 	ret.Msg = "无人编辑"
@@ -71,7 +71,11 @@ func UpdateSmartReportEditing(reportId, status, thisUserId int, thisUserName str
 			editor = adminIdName[opUserId]
 		}
 		ret.Status = 1
-		ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		if lang == utils.EnLangVersion {
+			ret.Msg = fmt.Sprintf("%s is currently editing the report", editor)
+		} else {
+			ret.Msg = fmt.Sprintf("当前%s正在编辑报告", editor)
+		}
 		ret.Editor = editor
 		return
 	}

static/ErrMsgConfig.json

@@ -30,5 +30,13 @@
   "品种名称已存在": "Product type exist",
   "该文件夹已存在": "The folder exists",
   "修改成功": "Modification Successful",
-  "添加失败，标签名称不能重复": "Addition Failed, Tag Name Must Be Unique"
+  "添加失败，标签名称不能重复": "Addition Failed, Tag Name Must Be Unique",
+  "请输入终端名称": "Please Enter Terminal Name",
+  "当前有未走完流程的报告，请走完流程后再做变更": "There are reports with incomplete processes,please complete the process before making changes.",
+  "当前有未走完流程的报告, 请走完流程后再做删除!": "There are reports with incomplete processes,please complete the process before deleting!",
+  "请选择PPT": "Please Select PPT",
+  "请输入章节名称": "Please enter the chapter name",
+  "请输入品种名称": "Please enter the variety name",
+  "计算成功": "Calculation successful",
+  "已关联图表的品种，不允许删除！": "Varieties with associated charts cannot be deleted!"
 }