fix: 报告分类

controllers/ppt_report.go

@@ -369,39 +369,6 @@ func (this *PptV2Controller) CreateReport() {
 	br.Msg = "操作成功"
 }
 
-// SubmitReport
-// @Title 提交报告
-// @Description 提交报告
-// @Param	request	body models.PptReportCreateReq true "type json string"
-// @Success 200 Ret=200 新增成功
-// @router /report/submit [post]
-func (this *PptV2Controller) SubmitReport() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		return
-	}
-	//var req models.PptReportCreateReq
-	//if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-	//	br.Msg = "参数解析异常"
-	//	br.ErrMsg = fmt.Sprintf("参数解析失败, %v", e)
-	//	return
-	//}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "操作成功"
-}
-
 // AuthList
 // @Title 获取有权限的列表
 // @Description 获取有权限的列表

models/ppt_v2.go

@@ -44,6 +44,7 @@ type PptV2 struct {
 	ReportSource     int       `gorm:"column:report_source" description:"报告来源：1-系统内；2-智力共享"`
 	OutReportId      string    `gorm:"column:out_report_id" description:"外部报告ID(或编码)"`
 	State            int       `gorm:"column:state" description:"报告状态：1-未发布；2-已发布；3-待提交；4-待审批；5-已驳回；6-已通过"`
+	TopicEndTime     time.Time `gorm:"column:topic_end_time" description:"课题结束时间"`
 }
 
 type PptV2Item struct {

models/report.go

@@ -93,6 +93,7 @@ type Report struct {
 	OutReportId         string     `gorm:"column:out_report_id" description:"外部报告ID(或编码)"`
 	PrePublishTime      *time.Time `gorm:"column:pre_publish_time" description:"预发布时间"`
 	PreMsgSend          int        `gorm:"column:pre_msg_send" description:"定时发布成功后是否立即推送模版消息，0：未发送，1：已发送"`
+	TopicEndTime        time.Time  `gorm:"column:topic_end_time" description:"课题结束时间"`
 }
 
 type ReportList struct {

routers/commentsRouter.go

@@ -6703,15 +6703,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta_gn/eta_api/controllers:PptV2Controller"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:PptV2Controller"],
-        beego.ControllerComments{
-            Method: "SubmitReport",
-            Router: `/report/submit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers:PptV2Controller"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:PptV2Controller"],
         beego.ControllerComments{
             Method: "SaveLog",

services/classify.go

@@ -303,13 +303,14 @@ func AddReportClassify(classifyName string, parentId int, classifyType, isRemind
 	}
 
 	// 更新分类的LevelPath
+	if parentId > 0 {
+		levelPath = fmt.Sprintf("%s,%d", levelPath, classify.Id)
+	}
 	if parentId == 0 {
 		levelPath = strconv.Itoa(classify.Id)
-	} else {
-		levelPath = fmt.Sprintf("%s,%d", levelPath, classify.Id)
 	}
 	classify.LevelPath = levelPath
-	if e := classify.UpdateClassify([]string{"levelPath"}); e != nil {
+	if e := classify.UpdateClassify([]string{"LevelPath"}); e != nil {
 		err = fmt.Errorf("更新分类层级路径失败, %v", e)
 		return
 	}

services/report_v2.go

@@ -1581,12 +1581,12 @@ func PublishReportV2(reportId int, sysUser *system.Admin) (tips string, err erro
 		_, _ = models.AddReportStateRecord(recordItem)
 
 		// 报告权限
-		minClassifyId, _, e := getMinClassify(reportInfo)
-		if e != nil {
-			utils.FileLog.Info(fmt.Sprintf("报告权限处理失败, ReportId: %d, Err: %v", reportId, e))
-			return
-		}
-		handleReportPermission(int64(reportInfo.Id), minClassifyId)
+		//minClassifyId, _, e := getMinClassify(reportInfo)
+		//if e != nil {
+		//	utils.FileLog.Info(fmt.Sprintf("报告权限处理失败, ReportId: %d, Err: %v", reportId, e))
+		//	return
+		//}
+		//handleReportPermission(int64(reportInfo.Id), minClassifyId)
 	}()
 
 	// 生成报告pdf和长图, 外部报告回调发起审批