国能-需求补充

controllers/report.go

@@ -72,167 +72,6 @@ func (this *ReportController) Delete() {
 	br.Msg = "删除成功"
 }
 
-//func (this *ReportController) Edit() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	sysUser := this.SysUser
-//	if sysUser == nil {
-//		br.Msg = "请登录"
-//		br.ErrMsg = "请登录，SysUser Is Empty"
-//		br.Ret = 408
-//		return
-//	}
-//
-//	var req models.EditReq
-//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-//	if err != nil {
-//		br.Msg = "参数解析异常！"
-//		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//		return
-//	}
-//	if req.Content == "" {
-//		br.Msg = "报告内容不能为空"
-//		return
-//	}
-//	var contentSub string
-//	if req.Content != "" {
-//		e := utils.ContentXssCheck(req.Content)
-//		if e != nil {
-//			br.Msg = "存在非法标签"
-//			br.ErrMsg = "存在非法标签, Err: " + e.Error()
-//			return
-//		}
-//		content, e := services.FilterReportContentBr(req.Content)
-//		if e != nil {
-//			br.Msg = "内容去除前后空格失败"
-//			br.ErrMsg = "内容去除前后空格失败, Err: " + e.Error()
-//			return
-//		}
-//		req.Content = content
-//
-//		contentSub, err = services.GetReportContentSub(req.Content)
-//		if err != nil {
-//			go alarm_msg.SendAlarmMsg("解析 ContentSub 失败，Err："+err.Error(), 3)
-//			//utils.SendEmail(utils.APPNAME+"失败提醒", "解析 ContentSub 失败，Err:"+err.Error(), utils.EmailSendToUsers)
-//		}
-//	}
-//
-//	//更新标记key
-//	markStatus, err := services.UpdateReportEditMark(int(req.ReportId), sysUser.AdminId, 1, sysUser.RealName, this.Lang)
-//	if err != nil {
-//		br.Msg = err.Error()
-//		return
-//	}
-//	if markStatus.Status == 1 {
-//		br.Msg = markStatus.Msg
-//		//br.Ret = 202 //202 服务器已接受请求，但尚未处理。
-//		return
-//	}
-//
-//	var stage int
-//	report, e := models.GetReportByReportId(int(req.ReportId))
-//	if e != nil {
-//		if utils.IsErrNoRow(e) {
-//			br.Msg = "报告已被删除, 请刷新页面"
-//			return
-//		}
-//		br.Msg = "操作失败"
-//		br.ErrMsg = "获取报告失败, Err: " + e.Error()
-//		return
-//	}
-//	if report.State == models.ReportStatePublished || report.State == models.ReportStatePass {
-//		br.Msg = "该报告已发布，不允许编辑"
-//		br.ErrMsg = "该报告已发布，不允许编辑"
-//		return
-//	}
-//	if report.ClassifyNameFirst != req.ClassifyNameFirst || report.ClassifyNameSecond != req.ClassifyNameSecond {
-//		maxStage, _ := models.GetReportStageEdit(req.ClassifyIdFirst, req.ClassifyIdSecond, int(req.ReportId))
-//		maxStage = maxStage + 1
-//		stage = maxStage
-//	} else {
-//		stage = report.Stage
-//	}
-//	//if req.State != report.State {
-//	//	recordItem := &models.ReportStateRecord{
-//	//		ReportId:   int(req.ReportId),
-//	//		ReportType: 1,
-//	//		State:      req.State,
-//	//		AdminId:    this.SysUser.AdminId,
-//	//		AdminName:  this.SysUser.AdminName,
-//	//		CreateTime: time.Now(),
-//	//	}
-//	//	go func() {
-//	//		_, _ = models.AddReportStateRecord(recordItem)
-//	//	}()
-//	//}
-//
-//	//item := new(models.Report)
-//	report.ClassifyIdFirst = req.ClassifyIdFirst
-//	report.ClassifyNameFirst = req.ClassifyNameFirst
-//	report.ClassifyIdSecond = req.ClassifyIdSecond
-//	report.ClassifyNameSecond = req.ClassifyNameSecond
-//	report.ClassifyIdThird = req.ClassifyIdThird
-//	report.ClassifyNameThird = req.ClassifyNameThird
-//	report.Title = req.Title
-//	report.Abstract = req.Abstract
-//	report.Author = req.Author
-//	report.Frequency = req.Frequency
-//	//report.State = report.State // 编辑不变更状态
-//	report.Stage = stage
-//	report.Content = html.EscapeString(req.Content)
-//	report.ContentSub = html.EscapeString(contentSub)
-//	report.CreateTime = req.CreateTime
-//	//report.CollaborateType = req.CollaborateType
-//	//report.ReportLayout = req.ReportLayout
-//	if req.IsPublicPublish <= 0 {
-//		req.IsPublicPublish = 1
-//	}
-//	report.IsPublicPublish = req.IsPublicPublish
-//	err = report.Update([]string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "ClassifyIdThird", "ClassifyNameThird", "Title", "Abstract", "Author", "Frequency", "Stage", "Content", "ContentSub", "CreateTime", "IsPublicPublish"})
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "保存失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	//处理权限
-//	//if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
-//	go func() {
-//		e := models.RemoveChartPermissionChapterMapping(req.ReportId)
-//		if e != nil {
-//			alarm_msg.SendAlarmMsg("修改删除报告权限失败，Err："+e.Error(), 3)
-//			return
-//		}
-//		permissionItems, e := models.GetPermission(req.ClassifyIdSecond)
-//		if e != nil {
-//			alarm_msg.SendAlarmMsg("获取权限失败，Err："+e.Error(), 3)
-//			return
-//		}
-//		for _, v := range permissionItems {
-//			e = models.AddChartPermissionChapterMapping(v.ChartPermissionId, req.ReportId)
-//			if e != nil {
-//				alarm_msg.SendAlarmMsg("新增权限失败，Err："+e.Error(), 3)
-//				return
-//			}
-//		}
-//		// 同步crm权限
-//		_ = services.EditReportPermissionSync(req.ReportId, req.ClassifyIdSecond)
-//	}()
-//	//}
-//
-//	reportCode := utils.MD5(strconv.Itoa(int(req.ReportId)))
-//	resp := new(models.EditResp)
-//	resp.ReportId = req.ReportId
-//	resp.ReportCode = reportCode
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "保存成功"
-//	br.Data = resp
-//}
-
 // Upload
 // @Title 图片上传
 // @Description 图片上传接口

controllers/report_chapter_type.go

@@ -168,7 +168,8 @@ func (this *ReportChapterTypeController) Add() {
 		return
 	}
 
-	cond = ` and product_id=1`
+	// 国能补充需求调整
+	/*cond = ` and product_id=1`
 	pars = make([]interface{}, 0)
 	permissionList, e := services.GetChartPermissionList(cond, pars)
 	if e != nil {
@@ -179,15 +180,15 @@ func (this *ReportChapterTypeController) Add() {
 	permissionIdName := make(map[int]string)
 	for i := range permissionList {
 		permissionIdName[permissionList[i].ChartPermissionId] = permissionList[i].PermissionName
-	}
+	}*/
 
 	newPermissions := make([]*models.ReportChapterTypePermission, 0) // 报告章节权限表(新)
-	for i := range req.ChartPermissionIdList {
+	for range req.ChartPermissionIdList {
 		newPermissions = append(newPermissions, &models.ReportChapterTypePermission{
 			ReportChapterTypeId:   item.ReportChapterTypeId,
 			ReportChapterTypeName: item.ReportChapterTypeName,
-			ChartPermissionId:     req.ChartPermissionIdList[i],
-			PermissionName:        permissionIdName[req.ChartPermissionIdList[i]],
+			ChartPermissionId:     0,
+			PermissionName:        "",
 			ResearchType:          item.ResearchType,
 			CreatedTime:           nowTime,
 		})

services/classify.go

@@ -269,85 +269,12 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 	classify.ReportDetailShowType = 1 //默认列表格式
 	classify.IsShow = 1
 	classify.Level = level
-	/*classify.Abstract = req.Abstract
-	classify.Descript = req.Descript
-	classify.Abstract = req.Abstract
-	classify.Descript = req.Descript
-	classify.ReportAuthor = req.ReportAuthor
-	classify.AuthorDescript = req.AuthorDescript
-	classify.ColumnImgUrl = req.ColumnImgUrl
-	classify.ReportImgUrl = req.ReportImgUrl
-	classify.HeadImgUrl = req.HeadImgUrl
-	classify.AvatarImgUrl = req.AvatarImgUrl
-	classify.HomeImgUrl = req.HomeImgUrl
-	classify.ClassifyLabel = req.ClassifyLabel
-	classify.ShowType = req.ShowType
-	classify.HasTeleconference = req.HasTeleconference
-	classify.VipTitle = req.VipTitle
-
-	classify.IsShow = req.IsShow
-	classify.YbFiccSort = req.YbFiccSort
-	classify.YbFiccIcon = req.YbFiccIcon
-	classify.YbFiccPcIcon = req.YbFiccPcIcon
-	classify.YbIconUrl = req.YbIconUrl
-	classify.YbBgUrl = req.YbBgUrl
-	classify.YbListImg = req.YbListImg
-	classify.YbShareBgImg = req.YbShareBgImg
-	classify.YbRightBanner = req.YbRightBanner
-	classify.RelateTel = req.RelateTel
-	classify.RelateVideo = req.RelateVideo
-	if req.ParentId > 0 {
-		parentClassify := new(models.Classify)
-		if parentClassify, err = models.GetClassifyById(req.ParentId); err != nil {
-			br.Msg = "获取父级分类信息失败"
-			br.ErrMsg = "获取父级分类信息失败, Err:" + err.Error()
-			return
-		}
-		updateParent := false
-		updateCols := make([]string, 0)
-		updateCols = append(updateCols, "HasTeleconference")
-		if req.HasTeleconference == 1 {
-			// 二级分类包含电话会，则一级分类也默认包含电话会
-			if parentClassify.HasTeleconference == 0 {
-				parentClassify.HasTeleconference = 1
-				updateParent = true
-			}
-		} else {
-			// 二级分类均无电话会，则一级分类也无电话会
-			if parentClassify.HasTeleconference == 1 {
-				child, err := models.GetClassifyChild(parentClassify.Id, "")
-				if err != nil {
-					br.Msg = "获取子分类失败"
-					br.ErrMsg = "获取子分类失败，Err:" + err.Error()
-					return
-				}
-				// 存在同一级分类下的二级分类有电话会则不变动
-				hasTel := false
-				for i := 0; i < len(child); i++ {
-					if child[i].HasTeleconference == 1 {
-						hasTel = true
-						break
-					}
-				}
-				if !hasTel {
-					parentClassify.HasTeleconference = 0
-					updateParent = true
-				}
-			}
-		}
-		if updateParent {
-			if err = parentClassify.UpdateClassify(updateCols); err != nil {
-				br.Msg = "更新父级分类失败"
-				br.ErrMsg = "更新父级分类失败, Err:" + err.Error()
-				return
-			}
-		}
-	}*/
+
 	err = models.AddClassify(classify)
 	if err != nil {
 		return
 	}
-
+	/* 国能补充需求调整
 	//获取报告分类权限列表
 	err = models.EditChartPermissionSearchKeyWordMappingMulti(classifyName, chartPermissionIdList, classify.Id)
 	if err != nil {
@@ -358,7 +285,7 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 	// 修改CRM权限
 	go func() {
 		_ = EditClassifyChartPermissionSync(classifyName, classify.Id)
-	}()
+	}()*/
 
 	// 如果父级分类不为空的话，那么就标记有子级分类，同时
 	if parentClassifyItem != nil {
@@ -704,7 +631,7 @@ func EditReportClassify(classifyId int, classifyName string, chartPermissionIdLi
 		}
 		return
 	}
-	originName := item.ClassifyName
+	//originName := item.ClassifyName
 
 	// 重名校验
 	existName, e := models.GetClassifyByName(classifyName, item.ParentId)
@@ -730,23 +657,23 @@ func EditReportClassify(classifyId int, classifyName string, chartPermissionIdLi
 	if err != nil {
 		return
 	}
-
-	err = models.EditChartPermissionSearchKeyWordMappingMulti(item.ClassifyName, chartPermissionIdList, item.Id)
-	if err != nil {
-		errMsg = "修改分类权限失败"
-		return
-	}
-
-	// 修改CRM权限
-	go func() {
-		_ = EditClassifyChartPermissionSync(item.ClassifyName, item.Id)
-	}()
-
-	// TODO 修改分类的关联品种时，历史报告中关联的品种怎么处理？
-	// 更新报告分类名称/父级分类后
-	go func() {
-		_ = AfterUpdateClassifyNameOrParent(item.Id, item.ParentId, item.ParentId, originName, item.ClassifyName, item.Level)
-	}()
+	/* 	国能补充需求调整
+	   	err = models.EditChartPermissionSearchKeyWordMappingMulti(item.ClassifyName, chartPermissionIdList, item.Id)
+	   	if err != nil {
+	   		errMsg = "修改分类权限失败"
+	   		return
+	   	}
+
+	   	// 修改CRM权限
+	   	go func() {
+	   		_ = EditClassifyChartPermissionSync(item.ClassifyName, item.Id)
+	   	}()
+
+	   	// TODO 修改分类的关联品种时，历史报告中关联的品种怎么处理？
+	   	// 更新报告分类名称/父级分类后
+	   	go func() {
+	   		_ = AfterUpdateClassifyNameOrParent(item.Id, item.ParentId, item.ParentId, originName, item.ClassifyName, item.Level)
+	   	}()*/
 
 	return
 }

services/report_v2.go

@@ -798,26 +798,28 @@ func EditChapterBaseInfoAndPermission(reportInfo *models.Report, reportChapterIn
 			delChapterPermissionMap[v.ChartPermissionId] = v
 		}
 
-		for _, permissionId := range permissionIdList {
-			_, ok := currChapterPermissionMap[permissionId]
-			// 如果存在，那么从 “需要删除的报告章节品种权限配置” 的map中移除
-			if ok {
-				delete(delChapterPermissionMap, permissionId)
-				continue
+		// 国能补充需求调整
+		/*
+			for _, permissionId := range permissionIdList {
+				_, ok := currChapterPermissionMap[permissionId]
+				// 如果存在，那么从 “需要删除的报告章节品种权限配置” 的map中移除
+				if ok {
+					delete(delChapterPermissionMap, permissionId)
+					continue
+				}
+				// 如果不存在，那么就新增品种权限配置
+				addChapterPermissionList = append(addChapterPermissionList, &report.ReportChapterPermissionMapping{
+					//ReportChapterPermissionMappingId:         0,
+					ReportChapterId:   reportChapterInfo.ReportChapterId,
+					ChartPermissionId: permissionId,
+					CreateTime:        time.Now(),
+				})
 			}
-			// 如果不存在，那么就新增品种权限配置
-			addChapterPermissionList = append(addChapterPermissionList, &report.ReportChapterPermissionMapping{
-				//ReportChapterPermissionMappingId:         0,
-				ReportChapterId:   reportChapterInfo.ReportChapterId,
-				ChartPermissionId: permissionId,
-				CreateTime:        time.Now(),
-			})
-		}
 
-		// 查出需要移除的品种权限配置
-		for _, v := range delChapterPermissionMap {
-			delChapterPermissionMappingIdList = append(delChapterPermissionMappingIdList, v.ReportChapterPermissionMappingId)
-		}
+			// 查出需要移除的品种权限配置
+			for _, v := range delChapterPermissionMap {
+				delChapterPermissionMappingIdList = append(delChapterPermissionMappingIdList, v.ReportChapterPermissionMappingId)
+			}*/
 	}
 
 	err = models.EditChapterBaseInfoAndPermission(reportInfo, reportChapterInfo, updateCols, addChapterAdminList, addChapterPermissionList, delReportChapterGrantIdList, delChapterPermissionMappingIdList)