Browse Source

feat:审批列表里面的智能研报和普通研报的筛选,合二为一

Roc 9 months ago
parent
commit
27d34ebc1e
3 changed files with 2 additions and 24 deletions
  1. 0 6
      controllers/report.go
  2. 1 18
      controllers/report_approve/report_approve_flow.go
  3. 1 0
      models/report.go

+ 0 - 6
controllers/report.go

@@ -2090,12 +2090,6 @@ func (this *ReportController) SendMsg() {
 		br.ErrMsg = "参数解析失败,Err:" + err.Error()
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
 	if req.ReportId <= 0 {
 		br.Msg = "参数错误"
 		br.ErrMsg = "参数错误"

+ 1 - 18
controllers/report_approve/report_approve_flow.go

@@ -653,7 +653,7 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 		hasFlowMap[k] = true
 	}
 
-	resp, cnTree, smartTree, enTree := make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0)
+	resp, cnTree, enTree := make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0)
 
 	var cnErr, enErr error
 	wg := sync.WaitGroup{}
@@ -677,14 +677,6 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 				v2.HasFlow = hasFlowMap[k]
 			}
 		}
-
-		smartTree = services.GetReportClassifyTreeRecursive(classify, 0)
-		for _, v := range smartTree {
-			for _, v2 := range v.Children {
-				k := fmt.Sprintf("%d-%d-%d", report_approve.FlowReportTypeSmart, v.ClassifyId, v2.ClassifyId)
-				v2.HasFlow = hasFlowMap[k]
-			}
-		}
 	}()
 
 	// 英文研报分类
@@ -729,10 +721,6 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 			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{
@@ -743,14 +731,9 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 			ClassifyId:   report_approve.FlowReportTypeEnglish,
 			ClassifyName: "英文研报",
 			Children:     enTree,
-		}, &report_approve.ReportClassifyTreeItem{
-			ClassifyId:   report_approve.FlowReportTypeSmart,
-			ClassifyName: "智能研报",
-			Children:     smartTree,
 		})
 	}
 
-
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

+ 1 - 0
models/report.go

@@ -346,6 +346,7 @@ type ReportDetail struct {
 	ChapterType        string `description:"章节类型 day-晨报 week-周报"`
 	AdminId            int    `description:"创建者账号"`
 	AdminRealName      string `description:"创建者姓名"`
+	ReportCode         string `description:"报告唯一编码"`
 
 	// eta1.8.3(研报改版)相关内容
 	ContentStruct       string    `description:"内容组件"`