fix:知识资源审批流修改

controllers/knowledge/resource.go

@@ -9,9 +9,6 @@ import (
 	knowledgeServ "eta_gn/eta_api/services/knowledge"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/h2non/filetype"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
 	"html"
 	"io/ioutil"
 	"os"
@@ -19,6 +16,10 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/h2non/filetype"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 )
 
 // 分类
@@ -201,13 +202,13 @@ func (this *ResourceController) List() {
 		var startTime, endTime string
 		if v.StartTime != nil && !v.StartTime.IsZero() {
 			startTime = v.StartTime.In(time.Local).Format(utils.FormatDateTime)
-			if resourceType == knowledge.KnowledgeResourceTypeOpinion || resourceType == knowledge.KnowledgeResourceTypeKnow {
+			if resourceType == knowledge.KnowledgeResourceTypeReport || resourceType == knowledge.KnowledgeResourceTypeKnow {
 				startTime = v.StartTime.In(time.Local).Format(utils.FormatDate)
 			}
 		}
 		if v.EndTime != nil && !v.EndTime.IsZero() {
 			endTime = v.EndTime.In(time.Local).Format(utils.FormatDateTime)
-			if resourceType == knowledge.KnowledgeResourceTypeOpinion || resourceType == knowledge.KnowledgeResourceTypeKnow {
+			if resourceType == knowledge.KnowledgeResourceTypeReport || resourceType == knowledge.KnowledgeResourceTypeKnow {
 				endTime = v.EndTime.In(time.Local).Format(utils.FormatDate)
 			}
 		}
@@ -309,7 +310,7 @@ func (this *ResourceController) Add() {
 		br.IsSendEmail = false
 		return
 	}
-	if req.ResourceType == knowledge.KnowledgeResourceTypeEvent || req.ResourceType == knowledge.KnowledgeResourceTypePolicy {
+	if req.ResourceType == knowledge.KnowledgeResourceTypeEvent || req.ResourceType == knowledge.KnowledgeResourceTypePolicy || req.ResourceType == knowledge.KnowledgeResourceTypeOpinion {
 		if req.StartTime == "" {
 			br.Msg = "开始时间必填"
 			br.ErrMsg = "开始时间必填"
@@ -385,7 +386,7 @@ func (this *ResourceController) Edit() {
 		return
 	}
 
-	if req.ResourceType == knowledge.KnowledgeResourceTypeEvent || req.ResourceType == knowledge.KnowledgeResourceTypePolicy {
+	if req.ResourceType == knowledge.KnowledgeResourceTypeEvent || req.ResourceType == knowledge.KnowledgeResourceTypePolicy || req.ResourceType == knowledge.KnowledgeResourceTypeOpinion {
 		if req.StartTime == "" {
 			br.Msg = "开始时间必填"
 			br.ErrMsg = "开始时间必填"

controllers/knowledge_approve/knowledge_approve.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
+	"eta_gn/eta_api/models/knowledge"
 	"eta_gn/eta_api/models/knowledge_approve/request"
 	"eta_gn/eta_api/models/knowledge_approve/response"
 	"eta_gn/eta_api/services/knowledge_approve"
@@ -31,7 +32,7 @@ type KnowledgeApproveController struct {
 // @Param   EndTime				query	string	false	"结束时间"
 // @Param   SortField			query	int		false	"排序字段：1-提交时间；2-处理时间；3-审批时间"
 // @Param   SortRule			query	int		false	"排序方式: 1-正序; 2-倒序(默认)"
-// @Success 200 {object} report_approve.KnowledgeApproveListResp
+// @Success 200 {object} report_approve.KnowledgeResourceApproveListResp
 // @router /list [get]
 func (this *KnowledgeApproveController) List() {
 	br := new(models.BaseResponse).Init()
@@ -64,7 +65,7 @@ func (this *KnowledgeApproveController) List() {
 	}
 	startSize := paging.StartIndex(currentIndex, pageSize)
 
-	var list []*response.KnowledgeApproveItemOrmResp
+	var list []*response.KnowledgeResourceApproveItemOrmResp
 	var total int
 	var msg string
 	var err error
@@ -81,16 +82,16 @@ func (this *KnowledgeApproveController) List() {
 	}
 	classifyMap := make(map[int]string)
 	for _, v := range classifyList {
-		classifyMap[v.BiDashboardClassifyId] = v.BiDashboardClassifyName
+		classifyMap[v.ClassifyId] = v.ClassifyName
 	}
 
 	switch listType {
 	case 1:
-		list, total, msg, err = knowledge_approve.ProcessingKnowledgeApprove(sysUser.AdminId, classifyId, timeType, sortField, sortRule, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
+		list, total, msg, err = knowledge_approve.ProcessingKnowledgeResourceApprove(sysUser.AdminId, classifyId, timeType, sortField, sortRule, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
 	case 2:
-		list, total, msg, err = knowledge_approve.SolvedKnowledgeApprove(sysUser.AdminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
+		list, total, msg, err = knowledge_approve.SolvedKnowledgeResourceApprove(sysUser.AdminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
 	case 3:
-		list, total, msg, err = knowledge_approve.MyApplyKnowledgeApproves(sysUser.AdminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
+		list, total, msg, err = knowledge_approve.MyApplyKnowledgeResourceApproves(sysUser.AdminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
 	default:
 		br.Msg = "列表类型错误"
 		return
@@ -108,7 +109,7 @@ func (this *KnowledgeApproveController) List() {
 		v.ClassifyName = classifyMap[v.ClassifyId]
 	}
 
-	resp := new(response.KnowledgeApproveListResp)
+	resp := new(response.KnowledgeResourceApproveListResp)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp.List = list
 	resp.Paging = page
@@ -120,9 +121,9 @@ func (this *KnowledgeApproveController) List() {
 }
 
 // list
-// @Title 公共看板分类列表
-// @Description 公共看板分类列表
-// @Success 200 {object} report_approve.BiApproveFlowDetailItem
+// @Title 公共知识资源分类列表
+// @Description 公共知识资源分类列表
+// @Success 200 {object} []*knowledge.KnowledgeClassifyItem
 // @router /classify/list [get]
 func (this *KnowledgeApproveController) ClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -133,7 +134,7 @@ func (this *KnowledgeApproveController) ClassifyList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	res, msg, err := knowledge_approve.GetPulicKnowledgeClassifyList()
+	res, msg, err := knowledge_approve.GetPulicKnowledgeClassifyList(knowledge.KnowledgeResourceTypeOpinion)
 	if err != nil {
 		if msg == "" {
 			br.Msg = "获取分类列表失败"
@@ -153,7 +154,7 @@ func (this *KnowledgeApproveController) ClassifyList() {
 // Approve
 // @Title 通过审批
 // @Description 通过审批
-// @Param	request	body request.KnowledgeApprovePassReq true "type json string"
+// @Param	request	body request.KnowledgeResourceApprovePassReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /approve [post]
 func (this *KnowledgeApproveController) Approve() {
@@ -172,20 +173,20 @@ func (this *KnowledgeApproveController) Approve() {
 		br.Ret = 408
 		return
 	}
-	var req request.KnowledgeApprovePassReq
+	var req request.KnowledgeResourceApprovePassReq
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
 		return
 	}
-	if req.KnowledgeApproveId <= 0 {
+	if req.KnowledgeResourceApproveId <= 0 {
 		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeApproveId: %d", req.KnowledgeApproveId)
+		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeResourceApproveId: %d", req.KnowledgeResourceApproveId)
 		return
 	}
 
 	// 通过审批
-	msg, err := knowledge_approve.PassKnowledgeApprove(req.KnowledgeApproveId, sysUser.AdminId)
+	msg, err := knowledge_approve.PassKnowledgeResourceApprove(req.KnowledgeResourceApproveId, sysUser.AdminId)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -204,8 +205,8 @@ func (this *KnowledgeApproveController) Approve() {
 // Detail
 // @Title 审批详情
 // @Description 审批详情
-// @Param   KnowledgeApproveId  query  int  true  "审批ID"
-// @Success 200 {object} report_approve.KnowledgeApproveDetail
+// @Param   KnowledgeResourceApproveId  query  int  true  "审批ID"
+// @Success 200 {object} report_approve.KnowledgeResourceApproveDetail
 // @router /detail [get]
 func (this *KnowledgeApproveController) Detail() {
 	br := new(models.BaseResponse).Init()
@@ -223,10 +224,10 @@ func (this *KnowledgeApproveController) Detail() {
 		br.Ret = 408
 		return
 	}
-	approveId, _ := this.GetInt("KnowledgeApproveId")
+	approveId, _ := this.GetInt("KnowledgeResourceApproveId")
 	if approveId <= 0 {
 		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeApproveId: %d", approveId)
+		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeResourceApproveId: %d", approveId)
 		return
 	}
 
@@ -250,7 +251,7 @@ func (this *KnowledgeApproveController) Detail() {
 // Refuse
 // @Title 驳回审批
 // @Description 驳回审批
-// @Param	request	body request.KnowledgeApproveRefuseReq true "type json string"
+// @Param	request	body request.KnowledgeResourceApproveRefuseReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /refuse [post]
 func (this *KnowledgeApproveController) Refuse() {
@@ -269,15 +270,15 @@ func (this *KnowledgeApproveController) Refuse() {
 		br.Ret = 408
 		return
 	}
-	var req request.KnowledgeApproveRefuseReq
+	var req request.KnowledgeResourceApproveRefuseReq
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
 		return
 	}
-	if req.KnowledgeApproveId <= 0 {
+	if req.KnowledgeResourceApproveId <= 0 {
 		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeApproveId: %d", req.KnowledgeApproveId)
+		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeResourceApproveId: %d", req.KnowledgeResourceApproveId)
 		return
 	}
 	maxStrLen := 500
@@ -286,7 +287,7 @@ func (this *KnowledgeApproveController) Refuse() {
 		br.Msg = fmt.Sprintf("审批驳回原因不能超过%d字", maxStrLen)
 		return
 	}
-	msg, err := knowledge_approve.KnowledgeApproveRefuse(req.KnowledgeApproveId, sysUser.AdminId, req.ApproveRemark)
+	msg, err := knowledge_approve.KnowledgeResourceApproveRefuse(req.KnowledgeResourceApproveId, sysUser.AdminId, req.ApproveRemark)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -305,7 +306,7 @@ func (this *KnowledgeApproveController) Refuse() {
 // Cancel
 // @Title 撤销审批
 // @Description 撤销审批
-// @Param	request	body report_approve.KnowledgeApproveCancelReq true "type json string"
+// @Param	request	body report_approve.KnowledgeResourceApproveCancelReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /cancel [post]
 func (this *KnowledgeApproveController) Cancel() {
@@ -324,20 +325,20 @@ func (this *KnowledgeApproveController) Cancel() {
 		br.Ret = 408
 		return
 	}
-	var req request.KnowledgeApproveCancelReq
+	var req request.KnowledgeResourceApproveCancelReq
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
 		return
 	}
-	if req.KnowledgeApproveId <= 0 {
+	if req.KnowledgeResourceApproveId <= 0 {
 		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeApproveId: %d", req.KnowledgeApproveId)
+		br.ErrMsg = fmt.Sprintf("参数有误, KnowledgeResourceApproveId: %d", req.KnowledgeResourceApproveId)
 		return
 	}
 
 	// 撤销审批
-	msg, e := knowledge_approve.KnowledgeApproveCancel(req.KnowledgeApproveId, sysUser.AdminId, sysUser.RealName)
+	msg, e := knowledge_approve.KnowledgeResourceApproveCancel(req.KnowledgeResourceApproveId, sysUser.AdminId, sysUser.RealName)
 	if e != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -358,7 +359,7 @@ func (this *KnowledgeApproveController) Cancel() {
 // @Description 审批消息列表
 // @Param   PageSize			query	int		true	"每页数据条数"
 // @Param   CurrentIndex		query	int		true	"当前页页码"
-// @Success 200 {object} report_approve.KnowledgeApproveMessageListResp
+// @Success 200 {object} report_approve.KnowledgeResourceApproveMessageListResp
 // @router /message/list [get]
 func (this *KnowledgeApproveController) MessageList() {
 	br := new(models.BaseResponse).Init()
@@ -388,9 +389,9 @@ func (this *KnowledgeApproveController) MessageList() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
-	resp := new(response.KnowledgeApproveMessageListResp)
-	resp.List = make([]*response.KnowledgeApproveMessageItem, 0)
-	list, total, unRead, msg, err := knowledge_approve.GetKnowledgeApproveMessage(sysUser.AdminId, startSize, pageSize)
+	resp := new(response.KnowledgeResourceApproveMessageListResp)
+	resp.List = make([]*response.KnowledgeResourceApproveMessageItem, 0)
+	list, total, unRead, msg, err := knowledge_approve.GetKnowledgeResourceApproveMessage(sysUser.AdminId, startSize, pageSize)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -414,7 +415,7 @@ func (this *KnowledgeApproveController) MessageList() {
 // MessageRead
 // @Title 消息已读
 // @Description 消息已读
-// @Param	request	body report_approve.KnowledgeApproveMessageReadReq true "type json string"
+// @Param	request	body report_approve.KnowledgeResourceApproveMessageReadReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /message/read [post]
 func (this *KnowledgeApproveController) MessageRead() {
@@ -433,7 +434,7 @@ func (this *KnowledgeApproveController) MessageRead() {
 		br.Ret = 408
 		return
 	}
-	var req request.KnowledgeApproveMessageReadReq
+	var req request.KnowledgeResourceApproveMessageReadReq
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
@@ -464,7 +465,7 @@ func (this *KnowledgeApproveController) MessageRead() {
 // CheckApproveOpen
 // @Title 校验分类是否开启审批
 // @Description 校验分类是否开启审批
-// @Param	request	body report_approve.KnowledgeApproveCheckApproveOpenReq true "type json string"
+// @Param	request	body report_approve.KnowledgeResourceApproveCheckApproveOpenReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /classify/check_open [post]
 func (this *KnowledgeApproveController) CheckApproveOpen() {
@@ -483,7 +484,7 @@ func (this *KnowledgeApproveController) CheckApproveOpen() {
 		br.Ret = 408
 		return
 	}
-	var req request.KnowledgeApproveCheckApproveOpenReq
+	var req request.KnowledgeResourceApproveCheckApproveOpenReq
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()

controllers/knowledge_approve/knowledge_approve_flow.go

@@ -64,7 +64,7 @@ func (c *KnowledgeApproveFlowController) List() {
 	}
 	condition += " ORDER BY create_time " + orderMap[sortRule]
 
-	res, total, msg, err := knowledge_approve.GetKnowledgeApproveFlowList(condition, pars, startSize, pageSize)
+	res, total, msg, err := knowledge_approve.GetKnowledgeResourceApproveFlowList(condition, pars, startSize, pageSize)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -75,7 +75,7 @@ func (c *KnowledgeApproveFlowController) List() {
 		return
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(response.KnowledgeApproveFlowListResp)
+	resp := new(response.KnowledgeResourceApproveFlowListResp)
 	resp.List = res
 	resp.Paging = page
 
@@ -88,7 +88,7 @@ func (c *KnowledgeApproveFlowController) List() {
 // Add
 // @Title 新增审批流
 // @Description 新增审批流
-// @Param	request	body request.KnowledgeApproveFlowSaveReq true "type json string"
+// @Param	request	body request.KnowledgeResourceApproveFlowSaveReq true "type json string"
 // @Success 200
 // @router /flow/add [post]
 func (c *KnowledgeApproveFlowController) Add() {
@@ -100,7 +100,7 @@ func (c *KnowledgeApproveFlowController) Add() {
 		c.Data["json"] = br
 		c.ServeJSON()
 	}()
-	var req *request.KnowledgeApproveFlowSaveReq
+	var req *request.KnowledgeResourceApproveFlowSaveReq
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
 		br.Msg = "参数解析失败"
 		br.ErrMsg = "参数解析失败, err:" + err.Error()
@@ -125,12 +125,12 @@ func (c *KnowledgeApproveFlowController) Add() {
 		return
 	}
 
-	if req.KnowledgeApproveFlowId > 0 {
+	if req.KnowledgeResourceApproveFlowId > 0 {
 		br.Msg = "审批流已存在"
 		return
 	}
 
-	_, msg, err := knowledge_approve.SaveKnowledgeApproveFlow(req)
+	_, msg, err := knowledge_approve.SaveKnowledgeResourceApproveFlow(req)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -149,7 +149,7 @@ func (c *KnowledgeApproveFlowController) Add() {
 // edit
 // @Title 新增审批流
 // @Description 新增审批流
-// @Param	request	body request.KnowledgeApproveFlowSaveReq true "type json string"
+// @Param	request	body request.KnowledgeResourceApproveFlowSaveReq true "type json string"
 // @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/edit [post]
 func (c *KnowledgeApproveFlowController) Edit() {
@@ -161,7 +161,7 @@ func (c *KnowledgeApproveFlowController) Edit() {
 		c.Data["json"] = br
 		c.ServeJSON()
 	}()
-	var req *request.KnowledgeApproveFlowSaveReq
+	var req *request.KnowledgeResourceApproveFlowSaveReq
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
 		br.Msg = "参数解析失败"
 		br.ErrMsg = "参数解析失败, err:" + err.Error()
@@ -186,12 +186,12 @@ func (c *KnowledgeApproveFlowController) Edit() {
 		return
 	}
 
-	if req.KnowledgeApproveFlowId == 0 {
+	if req.KnowledgeResourceApproveFlowId == 0 {
 		br.Msg = "审批流不存在, 请刷新重试"
 		return
 	}
 
-	ok, msg, err := knowledge_approve.SaveKnowledgeApproveFlow(req)
+	ok, msg, err := knowledge_approve.SaveKnowledgeResourceApproveFlow(req)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -214,7 +214,7 @@ func (c *KnowledgeApproveFlowController) Edit() {
 // delete
 // @Title 新增审批流
 // @Description 新增审批流
-// @Param	request	body request.KnowledgeApproveFlowRemoveReq true "type json string"
+// @Param	request	body request.KnowledgeResourceApproveFlowRemoveReq true "type json string"
 // @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/remove [post]
 func (c *KnowledgeApproveFlowController) Remove() {
@@ -226,17 +226,17 @@ func (c *KnowledgeApproveFlowController) Remove() {
 		c.Data["json"] = br
 		c.ServeJSON()
 	}()
-	var req *request.KnowledgeApproveFlowRemoveReq
+	var req *request.KnowledgeResourceApproveFlowRemoveReq
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
 		br.Msg = "参数解析失败"
 		br.ErrMsg = "参数解析失败, err:" + err.Error()
 		return
 	}
-	if req.KnowledgeApproveFlowId <= 0 {
+	if req.KnowledgeResourceApproveFlowId <= 0 {
 		br.Msg = "审批流不存在, 请刷新重试"
 		return
 	}
-	ok, msg, err := knowledge_approve.DeleteKnowledgeApproveFlow(req.KnowledgeApproveFlowId)
+	ok, msg, err := knowledge_approve.DeleteKnowledgeResourceApproveFlow(req.KnowledgeResourceApproveFlowId)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg
@@ -259,7 +259,7 @@ func (c *KnowledgeApproveFlowController) Remove() {
 // Detail
 // @Title 审批流详情
 // @Description 审批流详情
-// @Param	KnowledgeApproveFlowId   query	int   true "看板审批流ID"
+// @Param	KnowledgeResourceApproveFlowId   query	int   true "看板审批流ID"
 // @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/detail [get]
 func (c *KnowledgeApproveFlowController) Detail() {
@@ -278,12 +278,12 @@ func (c *KnowledgeApproveFlowController) Detail() {
 		br.Ret = 408
 		return
 	}
-	flowId, _ := c.GetInt("KnowledgeApproveFlowId")
+	flowId, _ := c.GetInt("KnowledgeResourceApproveFlowId")
 	if flowId <= 0 {
 		br.Msg = "审批流不存在"
 		return
 	}
-	detail, msg, err := knowledge_approve.GetKnowledgeApproveFlowDetail(flowId)
+	detail, msg, err := knowledge_approve.GetKnowledgeResourceApproveFlowDetail(flowId)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg

models/knowledge/knowledge_resource.go

@@ -4,8 +4,9 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 const (
@@ -13,10 +14,12 @@ const (
 	KnowledgeResourceTypeEvent = 0
 	// 事件-政策库
 	KnowledgeResourceTypePolicy = 1
-	// 事件-观点库
-	KnowledgeResourceTypeOpinion = 2
+	// 事件-报告库
+	KnowledgeResourceTypeReport = 2
 	// 事件类型-知识库
 	KnowledgeResourceTypeKnow = 3
+	// 事件-观点库
+	KnowledgeResourceTypeOpinion = 4
 )
 
 type KnowledgeResource struct {

models/knowledge/knowledge_tag.go

@@ -63,12 +63,12 @@ type KnowledgeTagListResp struct {
 type TagAddReq struct {
 	TagName      string `description:"分类名称"`
 	ParentId     int    `description:"父级分类id，没有父级分类传0"`
-	ResourceType int    `description:"分类类型：0事件库，1政策库，2观点库，3知识库"`
+	ResourceType int    `description:"分类类型：0事件库，1政策库，2报告库，3知识库，4观点库"`
 }
 
 type DeleteTagReq struct {
 	TagId        int `description:"分类ID"`
-	ResourceType int `description:"分类类型：0事件库，1政策库，2观点库，3知识库"`
+	ResourceType int `description:"分类类型：0事件库，1政策库，2报告库，3知识库，4观点库"`
 }
 
 type EditTagReq struct {
@@ -157,7 +157,7 @@ type TagMoveReq struct {
 	TagId        int `description:"分类ID"`
 	PrevTagId    int `description:"上一个兄弟节点分类id"`
 	NextTagId    int `description:"下一个兄弟节点分类id"`
-	ResourceType int `description:"分类类型：0事件库，1政策库，2观点库，3知识库"`
+	ResourceType int `description:"分类类型：0事件库，1政策库，2报告库，3知识库，4观点库"`
 }
 
 func (m *KnowledgeTag) GetTagListByKeyword(keyWord string, resourceType int) (items []*KnowledgeTagItem, err error) {

models/knowledge_approve/knowledge_approve.go

@@ -6,129 +6,129 @@ import (
 	"time"
 )
 
-type KnowledgeApprove struct {
-	KnowledgeApproveId int       `gorm:"column:knowledge_approve_id;primary_key"`
-	KnowledgeId        int       `gorm:"column:knowledge_id"`
-	KnowledgeTitle     string    `gorm:"column:knowledge_title"`
-	ClassifyId         int       `gorm:"column:classify_id"`
-	State              int       `gorm:"column:state"` //  '审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回'
-	FlowId             int       `gorm:"column:flow_id"`
-	FlowVersion        int       `gorm:"column:flow_version"`
-	StartNodeId        int       `gorm:"column:start_node_id"`
-	CurrNodeId         int       `gorm:"column:curr_node_id"`
-	ApplyUserId        int       `gorm:"column:apply_user_id"`
-	ApplyUserName      string    `gorm:"column:apply_user_name"`
-	ApproveRemark      string    `gorm:"column:approve_remark"`
-	ApproveTime        time.Time `gorm:"column:approve_time"`
-	CreateTime         time.Time `gorm:"column:create_time"`
-	ModifyTime         time.Time `gorm:"column:update_time"`
-}
-
-var KnowledgeApproveCols = struct {
-	KnowledgeApproveId string
-	KnowledgeId        string
-	KnowledgeTitle     string
-	ClassifyId         string
-	State              string //  '审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回'
-	FlowId             string
-	FlowVersion        string
-	StartNodeId        string
-	CurrNodeId         string
-	ApplyUserId        string
-	ApplyUserName      string
-	ApproveRemark      string
-	ApproveTime        string
-	CreateTime         string
-	ModifyTime         string
+type KnowledgeResourceApprove struct {
+	KnowledgeResourceApproveId int       `gorm:"column:knowledge_resource_approve_id;primary_key"`
+	KnowledgeResourceId        int       `gorm:"column:knowledge_resource_id"`
+	KnowledgeResourceTitle     string    `gorm:"column:knowledge_resource_title"`
+	ClassifyId                 int       `gorm:"column:classify_id"`
+	State                      int       `gorm:"column:state"` //  '审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回'
+	FlowId                     int       `gorm:"column:flow_id"`
+	FlowVersion                int       `gorm:"column:flow_version"`
+	StartNodeId                int       `gorm:"column:start_node_id"`
+	CurrNodeId                 int       `gorm:"column:curr_node_id"`
+	ApplyUserId                int       `gorm:"column:apply_user_id"`
+	ApplyUserName              string    `gorm:"column:apply_user_name"`
+	ApproveRemark              string    `gorm:"column:approve_remark"`
+	ApproveTime                time.Time `gorm:"column:approve_time"`
+	CreateTime                 time.Time `gorm:"column:create_time"`
+	ModifyTime                 time.Time `gorm:"column:update_time"`
+}
+
+var KnowledgeResourceApproveCols = struct {
+	KnowledgeResourceApproveId string
+	KnowledgeResourceId        string
+	KnowledgeResourceTitle     string
+	ClassifyId                 string
+	State                      string //  '审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回'
+	FlowId                     string
+	FlowVersion                string
+	StartNodeId                string
+	CurrNodeId                 string
+	ApplyUserId                string
+	ApplyUserName              string
+	ApproveRemark              string
+	ApproveTime                string
+	CreateTime                 string
+	ModifyTime                 string
 }{
-	KnowledgeApproveId: "knowledge_approve_id",
-	KnowledgeId:        "knowledge_id",
-	KnowledgeTitle:     "knowledge_title",
-	ClassifyId:         "classify_id",
-	State:              "state",
-	FlowId:             "flow_id",
-	FlowVersion:        "flow_version",
-	StartNodeId:        "start_node_id",
-	CurrNodeId:         "curr_node_id",
-	ApplyUserId:        "apply_user_id",
-	ApplyUserName:      "apply_user_name",
-	ApproveRemark:      "approve_remark",
-	ApproveTime:        "approve_time",
-	CreateTime:         "create_time",
-	ModifyTime:         "modify_time",
-}
-
-type KnowledgeApproveItemOrm struct {
-	KnowledgeApproveId       int       `description:"审批ID"`
-	KnowledgeApproveRecordId int       `description:"审批记录ID"`
-	KnowledgeId              int       `description:"报告ID"`
-	KnowledgeTitle           string    `description:"报告标题"`
-	ClassifyId               int       `description:"分类ID"`
-	State                    int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-	RecordState              int       `description:"审批记录状态：1-待审批；2-已通过；3-已驳回"`
-	FlowId                   int       `description:"审批流ID"`
-	FlowVersion              int       `description:"审批流版本"`
-	StartNodeId              int       `description:"开始节点ID"`
-	CurrNodeId               int       `description:"当前节点ID"`
-	ApplyUserId              int       `description:"申请人ID"`
-	ApplyUserName            string    `description:"申请人姓名"`
-	ApproveRemark            string    `description:"审批备注"`
-	ApproveTime              time.Time `description:"审批时间"`
-	HandleTime               time.Time `description:"处理时间"`
-	CreateTime               time.Time `description:"创建时间"`
-	ModifyTime               time.Time `description:"修改时间"`
-	NodeState                int       `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回" json:"-"`
-	NodeApproveTime          time.Time `description:"当前节点审批时间" json:"-"`
-}
-
-func (b *KnowledgeApprove) TableName() string {
-	return "knowledge_approve"
-}
-
-func (b *KnowledgeApprove) Update(cols []string) (err error) {
+	KnowledgeResourceApproveId: "knowledge_resource_approve_id",
+	KnowledgeResourceId:        "knowledge_resource_id",
+	KnowledgeResourceTitle:     "knowledge_resource_title",
+	ClassifyId:                 "classify_id",
+	State:                      "state",
+	FlowId:                     "flow_id",
+	FlowVersion:                "flow_version",
+	StartNodeId:                "start_node_id",
+	CurrNodeId:                 "curr_node_id",
+	ApplyUserId:                "apply_user_id",
+	ApplyUserName:              "apply_user_name",
+	ApproveRemark:              "approve_remark",
+	ApproveTime:                "approve_time",
+	CreateTime:                 "create_time",
+	ModifyTime:                 "modify_time",
+}
+
+type KnowledgeResourceApproveItemOrm struct {
+	KnowledgeResourceApproveId       int       `description:"审批ID"`
+	KnowledgeResourceApproveRecordId int       `description:"审批记录ID"`
+	KnowledgeResourceId              int       `description:"报告ID"`
+	KnowledgeResourceTitle           string    `description:"报告标题"`
+	ClassifyId                       int       `description:"分类ID"`
+	State                            int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
+	RecordState                      int       `description:"审批记录状态：1-待审批；2-已通过；3-已驳回"`
+	FlowId                           int       `description:"审批流ID"`
+	FlowVersion                      int       `description:"审批流版本"`
+	StartNodeId                      int       `description:"开始节点ID"`
+	CurrNodeId                       int       `description:"当前节点ID"`
+	ApplyUserId                      int       `description:"申请人ID"`
+	ApplyUserName                    string    `description:"申请人姓名"`
+	ApproveRemark                    string    `description:"审批备注"`
+	ApproveTime                      time.Time `description:"审批时间"`
+	HandleTime                       time.Time `description:"处理时间"`
+	CreateTime                       time.Time `description:"创建时间"`
+	ModifyTime                       time.Time `description:"修改时间"`
+	NodeState                        int       `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回" json:"-"`
+	NodeApproveTime                  time.Time `description:"当前节点审批时间" json:"-"`
+}
+
+func (b *KnowledgeResourceApprove) TableName() string {
+	return "knowledge_resource_approve"
+}
+
+func (b *KnowledgeResourceApprove) Update(cols []string) (err error) {
 	db := global.DmSQL["rddp"]
 	err = db.Model(b).Select(cols).Updates(b).Error
 	return
 }
 
-func (b *KnowledgeApprove) Create() (err error) {
+func (b *KnowledgeResourceApprove) Create() (err error) {
 	db := global.DmSQL["rddp"]
 	err = db.Create(b).Error
 	return
 }
 
-func GetKnowledgeApproveByFlowIdAndVersionId(knowledgeFlowId int, flowVersion int) (item []*KnowledgeApprove, err error) {
+func GetKnowledgeResourceApproveByFlowIdAndVersionId(knowledgeFlowId int, flowVersion int) (item []*KnowledgeResourceApprove, err error) {
 	db := global.DmSQL["rddp"]
 	err = db.Where("flow_id = ? AND flow_version = ?", knowledgeFlowId, flowVersion).Find(&item).Error
 	return
 }
 
-func GetKnowledgeApproveById(knowledgeApproveId int) (item *KnowledgeApprove, err error) {
+func GetKnowledgeResourceApproveById(KnowledgeResourceApproveId int) (item *KnowledgeResourceApprove, err error) {
 	db := global.DmSQL["rddp"]
-	err = db.Where("knowledge_approve_id = ?", knowledgeApproveId).First(&item).Error
+	err = db.Where("knowledge_resource_approve_id = ?", KnowledgeResourceApproveId).First(&item).Error
 	return
 }
 
-// GetApprovingKnowledgeApproveCount 获取待处理的审批分页列表总数
-func GetApprovingKnowledgeApproveCount(cond string, pars []interface{}) (count int, err error) {
-	base := fmt.Sprintf(`SELECT a.knowledge_approve_record_id
-		FROM knowledge_approve_record AS a
-		JOIN knowledge_approve AS b ON a.knowledge_approve_id = b.knowledge_approve_id AND a.node_id = b.curr_node_id
+// GetApprovingKnowledgeResourceApproveCount 获取待处理的审批分页列表总数
+func GetApprovingKnowledgeResourceApproveCount(cond string, pars []interface{}) (count int, err error) {
+	base := fmt.Sprintf(`SELECT a.knowledge_resource_approve_record_id
+		FROM knowledge_resource_approve_record AS a
+		JOIN knowledge_resource_approve AS b ON a.knowledge_resource_approve_id = b.knowledge_resource_approve_id AND a.node_id = b.curr_node_id
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
-// GetApprovingKnowledgeApprovePageList 获取待处理的审批列表-分页
-func GetApprovingKnowledgeApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeApproveItemOrm, err error) {
+// GetApprovingKnowledgeResourceApprovePageList 获取待处理的审批列表-分页
+func GetApprovingKnowledgeResourceApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeResourceApproveItemOrm, err error) {
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.knowledge_approve_record_id, a.state AS record_state, b.*
-		FROM knowledge_approve_record AS a
-		JOIN knowledge_approve AS b ON a.knowledge_approve_id = b.knowledge_approve_id AND a.node_id = b.curr_node_id
+	sql := fmt.Sprintf(`SELECT a.knowledge_resource_approve_record_id, a.state AS record_state, b.*
+		FROM knowledge_resource_approve_record AS a
+		JOIN knowledge_resource_approve AS b ON a.knowledge_resource_approve_id = b.knowledge_resource_approve_id AND a.node_id = b.curr_node_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
 	pars = append(pars, startSize, pageSize)
@@ -136,26 +136,26 @@ func GetApprovingKnowledgeApprovePageList(cond string, pars []interface{}, order
 	return
 }
 
-// GetApprovedKnowledgeApproveCount 获取已处理的审批分页列表总数
-func GetApprovedKnowledgeApproveCount(cond string, pars []interface{}) (count int, err error) {
-	base := fmt.Sprintf(`SELECT a.knowledge_approve_record_id
-		FROM knowledge_approve_record AS a
-		JOIN knowledge_approve AS b ON a.knowledge_approve_id = b.knowledge_approve_id
+// GetApprovedKnowledgeResourceApproveCount 获取已处理的审批分页列表总数
+func GetApprovedKnowledgeResourceApproveCount(cond string, pars []interface{}) (count int, err error) {
+	base := fmt.Sprintf(`SELECT a.knowledge_resource_approve_record_id
+		FROM knowledge_resource_approve_record AS a
+		JOIN knowledge_resource_approve AS b ON a.knowledge_resource_approve_id = b.knowledge_resource_approve_id
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
-// GetApprovedKnowledgeApprovePageList 获取已处理的审批列表-分页
-func GetApprovedKnowledgeApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeApproveItemOrm, err error) {
+// GetApprovedKnowledgeResourceApprovePageList 获取已处理的审批列表-分页
+func GetApprovedKnowledgeResourceApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeResourceApproveItemOrm, err error) {
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.knowledge_approve_record_id, a.node_state AS record_state,a.node_state,a.node_approve_time, a.node_approve_time AS handle_time, b.*
-		FROM knowledge_approve_record AS a
-		JOIN knowledge_approve AS b ON a.knowledge_approve_id = b.knowledge_approve_id
+	sql := fmt.Sprintf(`SELECT a.knowledge_resource_approve_record_id, a.node_state AS record_state,a.node_state,a.node_approve_time, a.node_approve_time AS handle_time, b.*
+		FROM knowledge_resource_approve_record AS a
+		JOIN knowledge_resource_approve AS b ON a.knowledge_resource_approve_id = b.knowledge_resource_approve_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
 	pars = append(pars, startSize, pageSize)
@@ -163,35 +163,35 @@ func GetApprovedKnowledgeApprovePageList(cond string, pars []interface{}, orderR
 	return
 }
 
-// GetApplyKnowledgeApproveCount 获取我发起的审批分页列表总数
-func GetApplyKnowledgeApproveCount(cond string, pars []interface{}) (count int, err error) {
-	base := fmt.Sprintf(`SELECT a.* FROM knowledge_approve AS a WHERE 1 = 1 %s`, cond)
+// GetApplyKnowledgeResourceApproveCount 获取我发起的审批分页列表总数
+func GetApplyKnowledgeResourceApproveCount(cond string, pars []interface{}) (count int, err error) {
+	base := fmt.Sprintf(`SELECT a.* FROM knowledge_resource_approve AS a WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
-// GetApplyKnowledgeApprovePageList 获取我发起的审批列表-分页
-func GetApplyKnowledgeApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeApproveItemOrm, err error) {
+// GetApplyKnowledgeResourceApprovePageList 获取我发起的审批列表-分页
+func GetApplyKnowledgeResourceApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*KnowledgeResourceApproveItemOrm, err error) {
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.* FROM knowledge_approve AS a WHERE 1 = 1 %s %s LIMIT ?,?`, cond, order)
+	sql := fmt.Sprintf(`SELECT a.* FROM knowledge_resource_approve AS a WHERE 1 = 1 %s %s LIMIT ?,?`, cond, order)
 	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-func GetKnowledgeApproveByBoardId(knowledgeApproveId int) (item *KnowledgeApprove, err error) {
+func GetKnowledgeResourceApproveByBoardId(KnowledgeResourceApproveId int) (item *KnowledgeResourceApprove, err error) {
 	db := global.DmSQL["rddp"]
-	err = db.Where("knowledge_id = ?", knowledgeApproveId).Order("create_time DESC").First(&item).Error
+	err = db.Where("knowledge_resource_id = ?", KnowledgeResourceApproveId).Order("create_time DESC").First(&item).Error
 	return
 }
 
-func GetKnowledgeApproveCountByState(state int) (count int, err error) {
+func GetKnowledgeResourceApproveCountByState(state int) (count int, err error) {
 	db := global.DmSQL["rddp"]
-	sql := `SELECT COUNT(*) FROM knowledge_approve WHERE state = ?`
+	sql := `SELECT COUNT(*) FROM knowledge_resource_approve WHERE state = ?`
 	err = db.Raw(sql, state).Scan(&count).Error
 	return
 }

models/knowledge_approve/knowledge_approve_flow.go

@@ -6,38 +6,38 @@ import (
 	"time"
 )
 
-type KnowledgeApproveFlow struct {
-	KnowledgeApproveFlowId int       `gorm:"column:knowledge_approve_flow_id;primaryKey"`
-	FlowName               string    `gorm:"column:flow_name"`
-	ClassifyId             int       `gorm:"column:classify_id"`
-	ClassifyName           string    `gorm:"column:classify_name"`
-	CurrVersion            int       `gorm:"column:curr_version"`
-	CreateTime             time.Time `gorm:"column:create_time"`
-	ModifyTime             time.Time `gorm:"column:modify_time"`
+type KnowledgeResourceApproveFlow struct {
+	KnowledgeResourceApproveFlowId int       `gorm:"column:knowledge_resource_approve_flow_id;primaryKey"`
+	FlowName                       string    `gorm:"column:flow_name"`
+	ClassifyId                     int       `gorm:"column:classify_id"`
+	ClassifyName                   string    `gorm:"column:classify_name"`
+	CurrVersion                    int       `gorm:"column:curr_version"`
+	CreateTime                     time.Time `gorm:"column:create_time"`
+	ModifyTime                     time.Time `gorm:"column:modify_time"`
 }
 
-var KnowledgeApproveFlowCols = struct {
-	KnowledgeApproveFlowId string
-	FlowName               string
-	ClassifyId             string
-	CurrVersion            string
-	CreateTime             string
-	ModifyTime             string
+var KnowledgeResourceApproveFlowCols = struct {
+	KnowledgeResourceApproveFlowId string
+	FlowName                       string
+	ClassifyId                     string
+	CurrVersion                    string
+	CreateTime                     string
+	ModifyTime                     string
 }{
-	KnowledgeApproveFlowId: "knowledge_approve_flow_id",
-	FlowName:               "flow_name",
-	ClassifyId:             "classify_id",
-	CurrVersion:            "curr_version",
-	CreateTime:             "create_time",
-	ModifyTime:             "modify_time",
+	KnowledgeResourceApproveFlowId: "knowledge_resource_approve_flow_id",
+	FlowName:                       "flow_name",
+	ClassifyId:                     "classify_id",
+	CurrVersion:                    "curr_version",
+	CreateTime:                     "create_time",
+	ModifyTime:                     "modify_time",
 }
 
-func (b *KnowledgeApproveFlow) TableName() string {
-	return "knowledge_approve_flow"
+func (b *KnowledgeResourceApproveFlow) TableName() string {
+	return "knowledge_resource_approve_flow"
 }
 
-func (b *KnowledgeApproveFlow) Add(node []*KnowledgeApproveNode) (err error) {
-	prevNodes := make([]*KnowledgeApproveNode, 0)
+func (b *KnowledgeResourceApproveFlow) Add(node []*KnowledgeResourceApproveNode) (err error) {
+	prevNodes := make([]*KnowledgeResourceApproveNode, 0)
 	o := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -64,20 +64,20 @@ func (b *KnowledgeApproveFlow) Add(node []*KnowledgeApproveNode) (err error) {
 		return
 	}
 	prevId := 0
-	prevNode := new(KnowledgeApproveNode)
+	prevNode := new(KnowledgeResourceApproveNode)
 	for k, v := range node {
-		v.KnowledgeApproveFlowId = b.KnowledgeApproveFlowId
+		v.KnowledgeResourceApproveFlowId = b.KnowledgeResourceApproveFlowId
 		v.PrevNodeId = prevId
 		err = o.Create(v).Error
 		if err != nil {
 			err = fmt.Errorf("insert node err: %v", err)
 			return
 		}
-		prevId = v.KnowledgeApproveNodeId
+		prevId = v.KnowledgeResourceApproveNodeId
 
 		// 下一个节点
 		if prevNode != nil && k > 0 && k < nodesLen {
-			prevNode.NextNodeId = v.KnowledgeApproveNodeId
+			prevNode.NextNodeId = v.KnowledgeResourceApproveNodeId
 			prevNodes = append(prevNodes, prevNode)
 		}
 		prevNode = v
@@ -85,8 +85,8 @@ func (b *KnowledgeApproveFlow) Add(node []*KnowledgeApproveNode) (err error) {
 	return
 }
 
-func (b *KnowledgeApproveFlow) Update(cols []string, node []*KnowledgeApproveNode) (err error) {
-	prevNodes := make([]*KnowledgeApproveNode, 0)
+func (b *KnowledgeResourceApproveFlow) Update(cols []string, node []*KnowledgeResourceApproveNode) (err error) {
+	prevNodes := make([]*KnowledgeResourceApproveNode, 0)
 	o := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -111,20 +111,20 @@ func (b *KnowledgeApproveFlow) Update(cols []string, node []*KnowledgeApproveNod
 		return
 	}
 	prevId := 0
-	prevNode := new(KnowledgeApproveNode)
+	prevNode := new(KnowledgeResourceApproveNode)
 	for k, v := range node {
-		v.KnowledgeApproveFlowId = b.KnowledgeApproveFlowId
+		v.KnowledgeResourceApproveFlowId = b.KnowledgeResourceApproveFlowId
 		v.PrevNodeId = prevId
 		err = o.Create(v).Error
 		if err != nil {
 			err = fmt.Errorf("insert node err: %v", err)
 			return
 		}
-		prevId = v.KnowledgeApproveNodeId
+		prevId = v.KnowledgeResourceApproveNodeId
 
 		// 下一个节点
 		if prevNode != nil && k > 0 && k < nodesLen {
-			prevNode.NextNodeId = v.KnowledgeApproveNodeId
+			prevNode.NextNodeId = v.KnowledgeResourceApproveNodeId
 			prevNodes = append(prevNodes, prevNode)
 		}
 		prevNode = v
@@ -132,11 +132,11 @@ func (b *KnowledgeApproveFlow) Update(cols []string, node []*KnowledgeApproveNod
 	return
 }
 
-func (b *KnowledgeApproveFlow) Delete() error {
+func (b *KnowledgeResourceApproveFlow) Delete() error {
 	return global.DmSQL["rddp"].Delete(b).Error
 }
 
-func (m *KnowledgeApproveFlow) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *KnowledgeApproveFlow, err error) {
+func (m *KnowledgeResourceApproveFlow) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *KnowledgeResourceApproveFlow, err error) {
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
@@ -146,19 +146,19 @@ func (m *KnowledgeApproveFlow) GetItemByCondition(condition string, pars []inter
 	return
 }
 
-func GetKnowledgeApproveFlowById(knowledgeApproveFlowId int) (item *KnowledgeApproveFlow, err error) {
-	err = global.DmSQL["rddp"].Where("knowledge_approve_flow_id = ?", knowledgeApproveFlowId).First(&item).Error
+func GetKnowledgeResourceApproveFlowById(KnowledgeResourceApproveFlowId int) (item *KnowledgeResourceApproveFlow, err error) {
+	err = global.DmSQL["rddp"].Where("knowledge_resource_approve_flow_id = ?", KnowledgeResourceApproveFlowId).First(&item).Error
 	return
 }
 
-func GetKnowledgeApproveFlowByClassifyId(classifyId int) (item *KnowledgeApproveFlow, err error) {
+func GetKnowledgeResourceApproveFlowByClassifyId(classifyId int) (item *KnowledgeResourceApproveFlow, err error) {
 	err = global.DmSQL["rddp"].Where("classify_id = ?", classifyId).First(&item).Error
 	return
 }
 
-func GetKnowledgeApproveFlowByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeApproveFlow, err error) {
+func GetKnowledgeResourceApproveFlowByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeResourceApproveFlow, err error) {
 	o := global.DmSQL["rddp"]
-	sql := "SELECT * FROM knowledge_approve_flow WHERE 1=1 "
+	sql := "SELECT * FROM knowledge_resource_approve_flow WHERE 1=1 "
 	if condition != "" {
 		sql += condition
 	}
@@ -168,9 +168,9 @@ func GetKnowledgeApproveFlowByCondition(condition string, pars []interface{}, st
 	return
 }
 
-func GetKnowledgeApproveFlowCountByCondition(condition string, pars []interface{}) (count int, err error) {
+func GetKnowledgeResourceApproveFlowCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["rddp"]
-	sql := "SELECT COUNT(*) AS count FROM knowledge_approve_flow WHERE 1=1 "
+	sql := "SELECT COUNT(*) AS count FROM knowledge_resource_approve_flow WHERE 1=1 "
 	if condition != "" {
 		sql += condition
 	}
@@ -180,6 +180,6 @@ func GetKnowledgeApproveFlowCountByCondition(condition string, pars []interface{
 
 func UpdateFlowClassifyName(classifyId int, classifyName string) (err error) {
 	o := global.DmSQL["rddp"]
-	err = o.Model(&KnowledgeApproveFlow{}).Where("classify_id = ?", classifyId).Update("classify_name", classifyName).Error
+	err = o.Model(&KnowledgeResourceApproveFlow{}).Where("classify_id = ?", classifyId).Update("classify_name", classifyName).Error
 	return
 }

models/knowledge_approve/knowledge_approve_message.go

@@ -8,58 +8,58 @@ import (
 	"time"
 )
 
-type KnowledgeApproveMessage struct {
-	Id                 int       `gorm:"primaryKey;column:id"`
-	SendUserId         int       `gorm:"column:send_user_id"`         // 发送人Id
-	ReceiveUserId      int       `gorm:"column:receive_user_id"`      // 接收者Id
-	Content            string    `gorm:"column:content"`              // 消息内容
-	Remark             string    `gorm:"column:remark"`               // 备注信息
-	KnowledgeApproveId int       `gorm:"column:knowledge_approve_id"` // 审批Id
-	ApproveState       int       `gorm:"column:approve_state"`        // 审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回
-	IsRead             int       `gorm:"column:is_read"`              // 是否已读：0-未读；1-已读
-	CreateTime         time.Time `gorm:"column:create_time"`          // 创建时间
-	ModifyTime         time.Time `gorm:"column:modify_time"`          // 修改时间
+type KnowledgeResourceApproveMessage struct {
+	Id                         int       `gorm:"primaryKey;column:id"`
+	SendUserId                 int       `gorm:"column:send_user_id"`                  // 发送人Id
+	ReceiveUserId              int       `gorm:"column:receive_user_id"`               // 接收者Id
+	Content                    string    `gorm:"column:content"`                       // 消息内容
+	Remark                     string    `gorm:"column:remark"`                        // 备注信息
+	KnowledgeResourceApproveId int       `gorm:"column:knowledge_resource_approve_id"` // 审批Id
+	ApproveState               int       `gorm:"column:approve_state"`                 // 审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回
+	IsRead                     int       `gorm:"column:is_read"`                       // 是否已读：0-未读；1-已读
+	CreateTime                 time.Time `gorm:"column:create_time"`                   // 创建时间
+	ModifyTime                 time.Time `gorm:"column:modify_time"`                   // 修改时间
 }
 
-var KnowledgeApproveMessageCols = struct {
-	Id                 string
-	SendUserId         string
-	ReceiveUserId      string
-	Content            string
-	Remark             string
-	KnowledgeApproveId string
-	ApproveState       string
-	IsRead             string
-	CreateTime         string
-	ModifyTime         string
+var KnowledgeResourceApproveMessageCols = struct {
+	Id                         string
+	SendUserId                 string
+	ReceiveUserId              string
+	Content                    string
+	Remark                     string
+	KnowledgeResourceApproveId string
+	ApproveState               string
+	IsRead                     string
+	CreateTime                 string
+	ModifyTime                 string
 }{
-	Id:                 "id",
-	SendUserId:         "send_user_id",
-	ReceiveUserId:      "receive_user_id",
-	Content:            "content",
-	Remark:             "remark",
-	KnowledgeApproveId: "knowledge_approve_id",
-	ApproveState:       "approve_state",
-	IsRead:             "is_read",
-	CreateTime:         "create_time",
-	ModifyTime:         "modify_time",
+	Id:                         "id",
+	SendUserId:                 "send_user_id",
+	ReceiveUserId:              "receive_user_id",
+	Content:                    "content",
+	Remark:                     "remark",
+	KnowledgeResourceApproveId: "knowledge_resource_approve_id",
+	ApproveState:               "approve_state",
+	IsRead:                     "is_read",
+	CreateTime:                 "create_time",
+	ModifyTime:                 "modify_time",
 }
 
-func (r *KnowledgeApproveMessage) TableName() string {
+func (r *KnowledgeResourceApproveMessage) TableName() string {
 	return "knowledge_approve_message"
 }
 
-func (r *KnowledgeApproveMessage) Create() (err error) {
+func (r *KnowledgeResourceApproveMessage) Create() (err error) {
 	o := global.DmSQL["rddp"]
 	err = o.Create(r).Error
 	return err
 }
 
-func (m *KnowledgeApproveMessage) PrimaryId() string {
-	return KnowledgeApproveMessageCols.Id
+func (m *KnowledgeResourceApproveMessage) PrimaryId() string {
+	return KnowledgeResourceApproveMessageCols.Id
 }
 
-func (r *KnowledgeApproveMessage) CreateMulti(items []*KnowledgeApproveMessage) (err error) {
+func (r *KnowledgeResourceApproveMessage) CreateMulti(items []*KnowledgeResourceApproveMessage) (err error) {
 	if len(items) == 0 {
 		return
 	}
@@ -68,13 +68,13 @@ func (r *KnowledgeApproveMessage) CreateMulti(items []*KnowledgeApproveMessage)
 	return
 }
 
-func (m *KnowledgeApproveMessage) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
+func (m *KnowledgeResourceApproveMessage) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
-func (m *KnowledgeApproveMessage) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeApproveMessage, err error) {
+func (m *KnowledgeResourceApproveMessage) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeResourceApproveMessage, err error) {
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -88,7 +88,7 @@ func (m *KnowledgeApproveMessage) GetItemsByCondition(condition string, pars []i
 	return
 }
 
-func (m *KnowledgeApproveMessage) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*KnowledgeApproveMessage, err error) {
+func (m *KnowledgeResourceApproveMessage) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*KnowledgeResourceApproveMessage, err error) {
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -103,13 +103,13 @@ func (m *KnowledgeApproveMessage) GetPageItemsByCondition(condition string, pars
 	return
 }
 
-func (m *KnowledgeApproveMessage) GetItemById(id int) (item *KnowledgeApproveMessage, err error) {
+func (m *KnowledgeResourceApproveMessage) GetItemById(id int) (item *KnowledgeResourceApproveMessage, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? `, m.TableName(), m.PrimaryId())
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
-func (m *KnowledgeApproveMessage) Update(cols []string) (err error) {
+func (m *KnowledgeResourceApproveMessage) Update(cols []string) (err error) {
 	err = global.DmSQL["rddp"].Model(m).Select(cols).Updates(m).Error
 	return
 }

models/knowledge_approve/knowledge_approve_node.go

@@ -7,50 +7,50 @@ import (
 	"time"
 )
 
-type KnowledgeApproveNode struct {
-	KnowledgeApproveNodeId int       `gorm:"column:knowledge_approve_node_id;primaryKey"`
-	KnowledgeApproveFlowId int       `gorm:"column:knowledge_approve_flow_id"`
-	PrevNodeId             int       `gorm:"column:prev_node_id"`
-	NextNodeId             int       `gorm:"column:next_node_id"`
-	NodeType               int       `gorm:"column:node_type"`
-	ApproveType            int       `gorm:"column:approve_type"`
-	Users                  string    `gorm:"column:users"`
-	CurrVersion            int       `gorm:"column:curr_version"`
-	CreatedTime            time.Time `gorm:"column:created_time"`
+type KnowledgeResourceApproveNode struct {
+	KnowledgeResourceApproveNodeId int       `gorm:"column:knowledge_resource_approve_node_id;primaryKey"`
+	KnowledgeResourceApproveFlowId int       `gorm:"column:knowledge_resource_approve_flow_id"`
+	PrevNodeId                     int       `gorm:"column:prev_node_id"`
+	NextNodeId                     int       `gorm:"column:next_node_id"`
+	NodeType                       int       `gorm:"column:node_type"`
+	ApproveType                    int       `gorm:"column:approve_type"`
+	Users                          string    `gorm:"column:users"`
+	CurrVersion                    int       `gorm:"column:curr_version"`
+	CreatedTime                    time.Time `gorm:"column:created_time"`
 }
 
-var KnowledgeApproveNodeCols = struct {
-	KnowledgeApproveNodeId string
-	KnowledgeApproveFlowId string
-	PrevNodeId             string
-	NextNodeId             string
-	NodeType               string
-	ApproveType            string
-	Users                  string
-	CurrVersion            string
-	CreatedTime            string
+var KnowledgeResourceApproveNodeCols = struct {
+	KnowledgeResourceApproveNodeId string
+	KnowledgeResourceApproveFlowId string
+	PrevNodeId                     string
+	NextNodeId                     string
+	NodeType                       string
+	ApproveType                    string
+	Users                          string
+	CurrVersion                    string
+	CreatedTime                    string
 }{
-	KnowledgeApproveNodeId: "knowledge_approve_node_id",
-	KnowledgeApproveFlowId: "knowledge_approve_flow_id",
-	PrevNodeId:             "prev_node_id",
-	NextNodeId:             "next_node_id",
-	NodeType:               "node_type",
-	ApproveType:            "approve_type",
-	Users:                  "users",
-	CurrVersion:            "curr_version",
-	CreatedTime:            "created_time",
+	KnowledgeResourceApproveNodeId: "knowledge_resource_approve_node_id",
+	KnowledgeResourceApproveFlowId: "knowledge_resource_approve_flow_id",
+	PrevNodeId:                     "prev_node_id",
+	NextNodeId:                     "next_node_id",
+	NodeType:                       "node_type",
+	ApproveType:                    "approve_type",
+	Users:                          "users",
+	CurrVersion:                    "curr_version",
+	CreatedTime:                    "created_time",
 }
 
-func (b *KnowledgeApproveNode) TableName() string {
-	return "knowledge_approve_node"
+func (b *KnowledgeResourceApproveNode) TableName() string {
+	return "knowledge_resource_approve_node"
 }
 
-func (m *KnowledgeApproveNode) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeApproveNode, err error) {
+func (m *KnowledgeResourceApproveNode) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeResourceApproveNode, err error) {
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
 	}
-	order := `ORDER BY created_time DESC, knowledge_approve_node_id ASC`
+	order := `ORDER BY created_time DESC, knowledge_resource_approve_node_id ASC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
@@ -59,7 +59,7 @@ func (m *KnowledgeApproveNode) GetItemsByCondition(condition string, pars []inte
 	return
 }
 
-func UpdateNextNodes(nodes []*KnowledgeApproveNode) (err error) {
+func UpdateNextNodes(nodes []*KnowledgeResourceApproveNode) (err error) {
 	if len(nodes) == 0 {
 		return
 	}
@@ -74,9 +74,9 @@ func UpdateNextNodes(nodes []*KnowledgeApproveNode) (err error) {
 	return
 }
 
-func GetKnowledgeApproveNodeByCondition(condition string, pars []interface{}) (node []*KnowledgeApproveNode, err error) {
+func GetKnowledgeResourceApproveNodeByCondition(condition string, pars []interface{}) (node []*KnowledgeResourceApproveNode, err error) {
 	o := global.DmSQL["rddp"]
-	sql := "SELECT * FROM knowledge_approve_node WHERE 1=1 "
+	sql := "SELECT * FROM knowledge_resource_approve_node WHERE 1=1 "
 	if condition != "" {
 		sql += condition
 	}
@@ -84,7 +84,7 @@ func GetKnowledgeApproveNodeByCondition(condition string, pars []interface{}) (n
 	return
 }
 
-func GetKnowledgeApproveNodeByFlowIdAndVersionId(flowId int, versionId int) (node []*KnowledgeApproveNode, err error) {
-	err = global.DmSQL["rddp"].Model(&KnowledgeApproveNode{}).Where("knowledge_approve_flow_id =? AND curr_version =?", flowId, versionId).Scan(&node).Error
+func GetKnowledgeResourceApproveNodeByFlowIdAndVersionId(flowId int, versionId int) (node []*KnowledgeResourceApproveNode, err error) {
+	err = global.DmSQL["rddp"].Model(&KnowledgeResourceApproveNode{}).Where("knowledge_resource_approve_flow_id =? AND curr_version =?", flowId, versionId).Scan(&node).Error
 	return
 }

models/knowledge_approve/knowledge_approve_record.go

@@ -8,81 +8,81 @@ import (
 	"time"
 )
 
-type KnowledgeApproveRecord struct {
-	KnowledgeApproveRecordId int       `gorm:"column:knowledge_approve_record_id;primary_key"`
-	KnowledgeApproveId       int       `gorm:"column:knowledge_approve_id"`
-	State                    int       `gorm:"column:state"`
-	NodeId                   int       `gorm:"column:node_id"`
-	NodeType                 int       `gorm:"column:node_type"`
-	PrevNodeId               int       `gorm:"column:prev_node_id"`
-	NextNodeId               int       `gorm:"column:next_node_id"`
-	ApproveType              int       `gorm:"column:approve_type"`
-	ApproveUserId            int       `gorm:"column:approve_user_id"`
-	ApproveUserName          string    `gorm:"column:approve_user_name"`
-	ApproveUserSort          int       `gorm:"column:approve_user_sort"`
-	ApproveRemark            string    `gorm:"column:approve_remark"`
-	ApproveTime              time.Time `gorm:"column:approve_time"`
-	CreateTime               time.Time `gorm:"column:create_time"`
-	ModifyTime               time.Time `gorm:"column:modify_time"`
-	NodeState                int       `gorm:"column:node_state"`
-	NodeApproveUserId        int       `gorm:"column:node_approve_user_id"`
-	NodeApproveUserName      string    `gorm:"column:node_approve_user_name"`
-	NodeApproveTime          time.Time `gorm:"column:node_approve_time"`
+type KnowledgeResourceApproveRecord struct {
+	KnowledgeResourceApproveRecordId int       `gorm:"column:knowledge_resource_approve_record_id;primary_key"`
+	KnowledgeResourceApproveId       int       `gorm:"column:knowledge_resource_approve_id"`
+	State                            int       `gorm:"column:state"`
+	NodeId                           int       `gorm:"column:node_id"`
+	NodeType                         int       `gorm:"column:node_type"`
+	PrevNodeId                       int       `gorm:"column:prev_node_id"`
+	NextNodeId                       int       `gorm:"column:next_node_id"`
+	ApproveType                      int       `gorm:"column:approve_type"`
+	ApproveUserId                    int       `gorm:"column:approve_user_id"`
+	ApproveUserName                  string    `gorm:"column:approve_user_name"`
+	ApproveUserSort                  int       `gorm:"column:approve_user_sort"`
+	ApproveRemark                    string    `gorm:"column:approve_remark"`
+	ApproveTime                      time.Time `gorm:"column:approve_time"`
+	CreateTime                       time.Time `gorm:"column:create_time"`
+	ModifyTime                       time.Time `gorm:"column:modify_time"`
+	NodeState                        int       `gorm:"column:node_state"`
+	NodeApproveUserId                int       `gorm:"column:node_approve_user_id"`
+	NodeApproveUserName              string    `gorm:"column:node_approve_user_name"`
+	NodeApproveTime                  time.Time `gorm:"column:node_approve_time"`
 }
 
-var KnowledgeApproveRecordCols = struct {
-	KnowledgeApproveRecordId string
-	KnowledgeApproveId       string
-	State                    string
-	NodeId                   string
-	NodeType                 string
-	PrevNodeId               string
-	NextNodeId               string
-	ApproveType              string
-	ApproveUserId            string
-	ApproveUserName          string
-	ApproveUserSort          string
-	ApproveRemark            string
-	ApproveTime              string
-	CreateTime               string
-	ModifyTime               string
-	NodeState                string
-	NodeApproveUserId        string
-	NodeApproveUserName      string
-	NodeApproveTime          string
+var KnowledgeResourceApproveRecordCols = struct {
+	KnowledgeResourceApproveRecordId string
+	KnowledgeResourceApproveId       string
+	State                            string
+	NodeId                           string
+	NodeType                         string
+	PrevNodeId                       string
+	NextNodeId                       string
+	ApproveType                      string
+	ApproveUserId                    string
+	ApproveUserName                  string
+	ApproveUserSort                  string
+	ApproveRemark                    string
+	ApproveTime                      string
+	CreateTime                       string
+	ModifyTime                       string
+	NodeState                        string
+	NodeApproveUserId                string
+	NodeApproveUserName              string
+	NodeApproveTime                  string
 }{
-	KnowledgeApproveRecordId: "knowledge_approve_record_id",
-	KnowledgeApproveId:       "knowledge_approve_id",
-	State:                    "state",
-	NodeId:                   "node_id",
-	NodeType:                 "node_type",
-	PrevNodeId:               "prev_node_id",
-	NextNodeId:               "next_node_id",
-	ApproveType:              "approve_type",
-	ApproveUserId:            "approve_user_id",
-	ApproveUserName:          "approve_user_name",
-	ApproveUserSort:          "approve_user_sort",
-	ApproveRemark:            "approve_remark",
-	ApproveTime:              "approve_time",
-	CreateTime:               "create_time",
-	ModifyTime:               "modify_time",
-	NodeState:                "node_state",
-	NodeApproveUserId:        "node_approve_user_id",
-	NodeApproveUserName:      "node_approve_user_name",
-	NodeApproveTime:          "node_approve_time",
+	KnowledgeResourceApproveRecordId: "knowledge_resource_approve_record_id",
+	KnowledgeResourceApproveId:       "knowledge_resource_approve_id",
+	State:                            "state",
+	NodeId:                           "node_id",
+	NodeType:                         "node_type",
+	PrevNodeId:                       "prev_node_id",
+	NextNodeId:                       "next_node_id",
+	ApproveType:                      "approve_type",
+	ApproveUserId:                    "approve_user_id",
+	ApproveUserName:                  "approve_user_name",
+	ApproveUserSort:                  "approve_user_sort",
+	ApproveRemark:                    "approve_remark",
+	ApproveTime:                      "approve_time",
+	CreateTime:                       "create_time",
+	ModifyTime:                       "modify_time",
+	NodeState:                        "node_state",
+	NodeApproveUserId:                "node_approve_user_id",
+	NodeApproveUserName:              "node_approve_user_name",
+	NodeApproveTime:                  "node_approve_time",
 }
 
-func (b *KnowledgeApproveRecord) TableName() string {
-	return "knowledge_approve_record"
+func (b *KnowledgeResourceApproveRecord) TableName() string {
+	return "knowledge_resource_approve_record"
 }
 
-func (b *KnowledgeApproveRecord) Create() (err error) {
+func (b *KnowledgeResourceApproveRecord) Create() (err error) {
 	o := global.DmSQL["rddp"]
 	err = o.Create(b).Error
 	return
 }
 
-func (b *KnowledgeApproveRecord) CreateMulti(items []*KnowledgeApproveRecord) (err error) {
+func (b *KnowledgeResourceApproveRecord) CreateMulti(items []*KnowledgeResourceApproveRecord) (err error) {
 	if len(items) == 0 {
 		return
 	}
@@ -91,15 +91,15 @@ func (b *KnowledgeApproveRecord) CreateMulti(items []*KnowledgeApproveRecord) (e
 	return
 }
 
-func (b *KnowledgeApproveRecord) Update(cols []string) (err error) {
+func (b *KnowledgeResourceApproveRecord) Update(cols []string) (err error) {
 	o := global.DmSQL["rddp"]
 	err = o.Model(b).Select(cols).Updates(b).Error
 	return
 }
 
-func GetKnowledgeApproveRecordByCondition(condition string, pars []interface{}) (record *KnowledgeApproveRecord, err error) {
+func GetKnowledgeResourceApproveRecordByCondition(condition string, pars []interface{}) (record *KnowledgeResourceApproveRecord, err error) {
 	o := global.DmSQL["rddp"]
-	sql := `SELECT * FROM knowledge_approve_record WHERE 1=1 `
+	sql := `SELECT * FROM knowledge_resource_approve_record WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -107,27 +107,27 @@ func GetKnowledgeApproveRecordByCondition(condition string, pars []interface{})
 	return
 }
 
-func GetKnowledgeApproveRecordItemsByCondition(condition string, pars []interface{}) (items []*KnowledgeApproveRecord, err error) {
+func GetKnowledgeResourceApproveRecordItemsByCondition(condition string, pars []interface{}) (items []*KnowledgeResourceApproveRecord, err error) {
 	order := `ORDER BY create_time DESC`
-	sql := fmt.Sprintf(`SELECT * FROM knowledge_approve_record WHERE 1=1 %s %s`, condition, order)
+	sql := fmt.Sprintf(`SELECT * FROM knowledge_resource_approve_record WHERE 1=1 %s %s`, condition, order)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-func (b *KnowledgeApproveRecord) UpdateNodeState(knowledgeApproveId, nodeId, nodeState, nodeApproveUserId int, nodeApproveUserName string, nodeApproveTime time.Time) (err error) {
+func (b *KnowledgeResourceApproveRecord) UpdateNodeState(KnowledgeResourceApproveId, nodeId, nodeState, nodeApproveUserId int, nodeApproveUserName string, nodeApproveTime time.Time) (err error) {
 	pars := make([]interface{}, 0)
 	pars = append(pars, nodeState, nodeApproveUserId, nodeApproveUserName, nodeApproveTime)
 
 	// 更新条件
-	whereParas := []interface{}{knowledgeApproveId, nodeId}
+	whereParas := []interface{}{KnowledgeResourceApproveId, nodeId}
 	pars = append(pars, whereParas...)
 
-	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE knowledge_approve_id = ? AND node_id = ?`, b.TableName())
+	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE knowledge_resource_approve_id = ? AND node_id = ?`, b.TableName())
 	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
 
-func (m *KnowledgeApproveRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeApproveRecord, err error) {
+func (m *KnowledgeResourceApproveRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*KnowledgeResourceApproveRecord, err error) {
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -141,7 +141,7 @@ func (m *KnowledgeApproveRecord) GetItemsByCondition(condition string, pars []in
 	return
 }
 
-func (m *KnowledgeApproveRecord) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *KnowledgeApproveRecord, err error) {
+func (m *KnowledgeResourceApproveRecord) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *KnowledgeResourceApproveRecord, err error) {
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule

models/knowledge_approve/request/knowledge_approve.go

@@ -1,21 +1,21 @@
 package request
 
-type KnowledgeApprovePassReq struct {
-	KnowledgeApproveId int `description:"审批ID"`
+type KnowledgeResourceApprovePassReq struct {
+	KnowledgeResourceApproveId int `description:"审批ID"`
 }
 
-// KnowledgeApproveRefuseReq 审批驳回请求体
-type KnowledgeApproveRefuseReq struct {
-	KnowledgeApproveId int    `description:"审批ID"`
-	ApproveRemark      string `description:"驳回理由"`
+// KnowledgeResourceApproveRefuseReq 审批驳回请求体
+type KnowledgeResourceApproveRefuseReq struct {
+	KnowledgeResourceApproveId int    `description:"审批ID"`
+	ApproveRemark              string `description:"驳回理由"`
 }
 
-// KnowledgeApproveCancelReq 撤销审批请求体
-type KnowledgeApproveCancelReq struct {
-	KnowledgeApproveId int `description:"审批ID"`
+// KnowledgeResourceApproveCancelReq 撤销审批请求体
+type KnowledgeResourceApproveCancelReq struct {
+	KnowledgeResourceApproveId int `description:"审批ID"`
 }
 
-// KnowledgeApproveCheckApproveOpenReq 校验分类是否打开审批请求体
-type KnowledgeApproveCheckApproveOpenReq struct {
+// KnowledgeResourceApproveCheckApproveOpenReq 校验分类是否打开审批请求体
+type KnowledgeResourceApproveCheckApproveOpenReq struct {
 	ClassifyId int `description:"一级分类ID"`
 }

models/knowledge_approve/request/knowledge_approve_flow.go

@@ -1,10 +1,10 @@
 package request
 
-type KnowledgeApproveFlowSaveReq struct {
-	KnowledgeApproveFlowId int
-	ClassifyId             int
-	FlowName               string
-	Nodes                  []Node
+type KnowledgeResourceApproveFlowSaveReq struct {
+	KnowledgeResourceApproveFlowId int
+	ClassifyId                     int
+	FlowName                       string
+	Nodes                          []Node
 }
 
 type Node struct {
@@ -18,6 +18,6 @@ type User struct {
 	UserType string `description:"用户类型: user-用户 role-角色"`
 }
 
-type KnowledgeApproveFlowRemoveReq struct {
-	KnowledgeApproveFlowId int
+type KnowledgeResourceApproveFlowRemoveReq struct {
+	KnowledgeResourceApproveFlowId int
 }

models/knowledge_approve/request/knowledge_approve_message.go

@@ -1,5 +1,5 @@
 package request
 
-type KnowledgeApproveMessageReadReq struct {
+type KnowledgeResourceApproveMessageReadReq struct {
 	MessageId int `description:"审批消息ID"`
 }

models/knowledge_approve/response/knowledge_approve.go

@@ -1,90 +1,90 @@
 package response
 
-// KnowledgeApproveDetail 审批详情信息
-type KnowledgeApproveDetail struct {
-	Knowledge        *KnowledgeApproveDetailKnowledge `description:"报告信息"`
-	Approve          *KnowledgeApproveDetailItem      `description:"审批信息"`
-	ApproveFlowNodes []*KnowledgeApproveDetailNodes   `description:"审批节点信息"`
+// KnowledgeResourceApproveDetail 审批详情信息
+type KnowledgeResourceApproveDetail struct {
+	Knowledge        *KnowledgeResourceApproveDetailKnowledge `description:"报告信息"`
+	Approve          *KnowledgeResourceApproveDetailItem      `description:"审批信息"`
+	ApproveFlowNodes []*KnowledgeResourceApproveDetailNodes   `description:"审批节点信息"`
 }
 
-// KnowledgeApproveDetailKnowledge 审批详情-报告信息
-type KnowledgeApproveDetailKnowledge struct {
-	KnowledgeId       int    `description:"知识资源ID"`
-	KnowledgeTitle    string `description:"知识资源标题"`
-	KnowledgeCode     string `description:"知识资源code"`
-	KnowledgeClassify string `description:"知识资源分类"`
+// KnowledgeResourceApproveDetailKnowledge 审批详情-报告信息
+type KnowledgeResourceApproveDetailKnowledge struct {
+	KnowledgeResourceId    int    `description:"知识资源ID"`
+	KnowledgeResourceTitle string `description:"知识资源标题"`
+	KnowledgeCode          string `description:"知识资源code"`
+	KnowledgeClassify      string `description:"知识资源分类"`
 }
 
-// KnowledgeApproveDetailItem 审批详情-审批信息
-type KnowledgeApproveDetailItem struct {
-	KnowledgeApproveId int    `description:"审批ID"`
-	State              int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-	FlowId             int    `description:"审批流ID"`
-	FlowVersion        int    `description:"审批流版本"`
-	StartNodeId        int    `description:"开始节点ID"`
-	CurrNodeId         int    `description:"当前节点ID"`
-	ApplyUserId        int    `description:"申请人ID"`
-	ApplyUserName      string `description:"申请人姓名"`
-	ApproveTime        string `description:"审批时间"`
-	CreateTime         string `description:"创建时间"`
-	ModifyTime         string `description:"修改时间"`
+// KnowledgeResourceApproveDetailItem 审批详情-审批信息
+type KnowledgeResourceApproveDetailItem struct {
+	KnowledgeResourceApproveId int    `description:"审批ID"`
+	State                      int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
+	FlowId                     int    `description:"审批流ID"`
+	FlowVersion                int    `description:"审批流版本"`
+	StartNodeId                int    `description:"开始节点ID"`
+	CurrNodeId                 int    `description:"当前节点ID"`
+	ApplyUserId                int    `description:"申请人ID"`
+	ApplyUserName              string `description:"申请人姓名"`
+	ApproveTime                string `description:"审批时间"`
+	CreateTime                 string `description:"创建时间"`
+	ModifyTime                 string `description:"修改时间"`
 }
 
-// KnowledgeApproveDetailNodes 审批详情-节点信息
-type KnowledgeApproveDetailNodes struct {
-	KnowledgeApproveNodeId int                               `description:"知识资源审批节点ID"`
-	KnowledgeApproveFlowId int                               `description:"知识资源审批流ID"`
-	PrevNodeId             int                               `description:"上一个节点ID（0为开始节点）"`
-	NextNodeId             int                               `description:"下一个节点ID（0为结束节点）"`
-	NodeType               int                               `description:"节点类型：0-审批；1-抄送"`
-	ApproveType            int                               `description:"审批类型：1-依次审批；2-会签；3-或签"`
-	Users                  []*KnowledgeApproveDetailNodeUser `description:"审批人信息"`
+// KnowledgeResourceApproveDetailNodes 审批详情-节点信息
+type KnowledgeResourceApproveDetailNodes struct {
+	KnowledgeResourceApproveNodeId int                                       `description:"知识资源审批节点ID"`
+	KnowledgeResourceApproveFlowId int                                       `description:"知识资源审批流ID"`
+	PrevNodeId                     int                                       `description:"上一个节点ID（0为开始节点）"`
+	NextNodeId                     int                                       `description:"下一个节点ID（0为结束节点）"`
+	NodeType                       int                                       `description:"节点类型：0-审批；1-抄送"`
+	ApproveType                    int                                       `description:"审批类型：1-依次审批；2-会签；3-或签"`
+	Users                          []*KnowledgeResourceApproveDetailNodeUser `description:"审批人信息"`
 }
 
-// KnowledgeApproveDetailNodeUser 审批详情-节点用户信息
-type KnowledgeApproveDetailNodeUser struct {
-	KnowledgeApproveNodeUserReq
-	ApproveRecord *KnowledgeApproveDetailNodeUserRecord `description:"用户审批记录"`
+// KnowledgeResourceApproveDetailNodeUser 审批详情-节点用户信息
+type KnowledgeResourceApproveDetailNodeUser struct {
+	KnowledgeResourceApproveNodeUserReq
+	ApproveRecord *KnowledgeResourceApproveDetailNodeUserRecord `description:"用户审批记录"`
 }
 
-// KnowledgeApproveNodeUserReq 报告审批节点用户请求体
-type KnowledgeApproveNodeUserReq struct {
+// KnowledgeResourceApproveNodeUserReq 报告审批节点用户请求体
+type KnowledgeResourceApproveNodeUserReq struct {
 	UserType string `description:"审批人类型: user-用户; role-角色"`
 	UserId   int    `description:"用户/角色ID"`
 	UserName string `description:"用户/角色姓名"`
 	Sort     int    `description:"排序"`
 }
 
-// KnowledgeApproveDetailNodeUserRecord 审批详情-节点用户审批记录
-type KnowledgeApproveDetailNodeUserRecord struct {
-	KnowledgeApproveRecordId int    `description:"审批记录ID"`
-	State                    int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-	ApproveUserId            int    `description:"审批人ID"`
-	ApproveUserName          string `description:"审批人姓名"`
-	ApproveRemark            string `description:"审批备注"`
-	ApproveTime              string `description:"审批时间"`
+// KnowledgeResourceApproveDetailNodeUserRecord 审批详情-节点用户审批记录
+type KnowledgeResourceApproveDetailNodeUserRecord struct {
+	KnowledgeResourceApproveRecordId int    `description:"审批记录ID"`
+	State                            int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
+	ApproveUserId                    int    `description:"审批人ID"`
+	ApproveUserName                  string `description:"审批人姓名"`
+	ApproveRemark                    string `description:"审批备注"`
+	ApproveTime                      string `description:"审批时间"`
 }
 
-type KnowledgeApproveItemOrmResp struct {
-	KnowledgeApproveId       int    `description:"审批ID"`
-	KnowledgeApproveRecordId int    `description:"审批记录ID"`
-	KnowledgeId              int    `description:"报告ID"`
-	KnowledgeTitle           string `description:"报告标题"`
-	ClassifyId               int    `description:"分类ID"`
-	ClassifyName             string `description:"分类名称"`
-	State                    int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-	RecordState              int    `description:"审批记录状态：1-待审批；2-已通过；3-已驳回"`
-	FlowId                   int    `description:"审批流ID"`
-	FlowVersion              int    `description:"审批流版本"`
-	StartNodeId              int    `description:"开始节点ID"`
-	CurrNodeId               int    `description:"当前节点ID"`
-	ApplyUserId              int    `description:"申请人ID"`
-	ApplyUserName            string `description:"申请人姓名"`
-	ApproveRemark            string `description:"审批备注"`
-	ApproveTime              string `description:"审批时间"`
-	HandleTime               string `description:"处理时间"`
-	CreateTime               string `description:"创建时间"`
-	ModifyTime               string `description:"修改时间"`
-	NodeState                int    `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回" json:"-"`
-	NodeApproveTime          string `description:"当前节点审批时间" json:"-"`
+type KnowledgeResourceApproveItemOrmResp struct {
+	KnowledgeResourceApproveId       int    `description:"审批ID"`
+	KnowledgeResourceApproveRecordId int    `description:"审批记录ID"`
+	KnowledgeResourceId              int    `description:"报告ID"`
+	KnowledgeResourceTitle           string `description:"报告标题"`
+	ClassifyId                       int    `description:"分类ID"`
+	ClassifyName                     string `description:"分类名称"`
+	State                            int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
+	RecordState                      int    `description:"审批记录状态：1-待审批；2-已通过；3-已驳回"`
+	FlowId                           int    `description:"审批流ID"`
+	FlowVersion                      int    `description:"审批流版本"`
+	StartNodeId                      int    `description:"开始节点ID"`
+	CurrNodeId                       int    `description:"当前节点ID"`
+	ApplyUserId                      int    `description:"申请人ID"`
+	ApplyUserName                    string `description:"申请人姓名"`
+	ApproveRemark                    string `description:"审批备注"`
+	ApproveTime                      string `description:"审批时间"`
+	HandleTime                       string `description:"处理时间"`
+	CreateTime                       string `description:"创建时间"`
+	ModifyTime                       string `description:"修改时间"`
+	NodeState                        int    `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回" json:"-"`
+	NodeApproveTime                  string `description:"当前节点审批时间" json:"-"`
 }

models/knowledge_approve/response/knowledge_approve_flow.go

@@ -4,43 +4,43 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-type KnowledgeApproveFlowItem struct {
-	KnowledgeApproveFlowId int    `description:"主键"`
-	FlowName               string `description:"知识资源审批流程名称"`
-	ClassifyId             int    `description:"分类ID"`
-	ClassifyName           string `description:"分类名称"`
-	CurrVersion            int    `description:"当前版本"`
-	CreateTime             string `description:"创建时间"`
-	ModifyTime             string `description:"修改时间"`
+type KnowledgeResourceApproveFlowItem struct {
+	KnowledgeResourceApproveFlowId int    `description:"主键"`
+	FlowName                       string `description:"知识资源审批流程名称"`
+	ClassifyId                     int    `description:"分类ID"`
+	ClassifyName                   string `description:"分类名称"`
+	CurrVersion                    int    `description:"当前版本"`
+	CreateTime                     string `description:"创建时间"`
+	ModifyTime                     string `description:"修改时间"`
 }
 
-type KnowledgeApproveFlowListResp struct {
-	List   []*KnowledgeApproveFlowItem
+type KnowledgeResourceApproveFlowListResp struct {
+	List   []*KnowledgeResourceApproveFlowItem
 	Paging *paging.PagingItem
 }
 
-type KnowledgeApproveFlowDetailResp struct {
-	KnowledgeApproveFlowItem `description:"审批流信息"`
-	Nodes                    []*KnowledgeApproveNodeItem `description:"节点信息"`
+type KnowledgeResourceApproveFlowDetailResp struct {
+	KnowledgeResourceApproveFlowItem `description:"审批流信息"`
+	Nodes                            []*KnowledgeResourceApproveNodeItem `description:"节点信息"`
 }
 
-type KnowledgeApproveNodeUser struct {
+type KnowledgeResourceApproveNodeUser struct {
 	UserType string `description:"审批人类型: user-用户; role-角色"`
 	UserId   int    `description:"用户/角色ID"`
 	UserName string `description:"用户/角色姓名"`
 	Sort     int    `description:"排序"`
 }
-type KnowledgeApproveNodeItem struct {
-	KnowledgeApproveNodeId int                         `description:"知识资源审批节点ID"`
-	KnowledgeApproveFlowId int                         `description:"知识资源审批流ID"`
-	PrevNodeId             int                         `description:"上一个节点ID（0为开始节点）"`
-	NextNodeId             int                         `description:"下一个节点ID（0为结束节点）"`
-	NodeType               int                         `description:"节点类型：0-审批；1-抄送"`
-	ApproveType            int                         `description:"审批类型：1-依次审批；2-会签；3-或签"`
-	Users                  []*KnowledgeApproveNodeUser `description:"审批人信息"`
+type KnowledgeResourceApproveNodeItem struct {
+	KnowledgeResourceApproveNodeId int                                 `description:"知识资源审批节点ID"`
+	KnowledgeResourceApproveFlowId int                                 `description:"知识资源审批流ID"`
+	PrevNodeId                     int                                 `description:"上一个节点ID（0为开始节点）"`
+	NextNodeId                     int                                 `description:"下一个节点ID（0为结束节点）"`
+	NodeType                       int                                 `description:"节点类型：0-审批；1-抄送"`
+	ApproveType                    int                                 `description:"审批类型：1-依次审批；2-会签；3-或签"`
+	Users                          []*KnowledgeResourceApproveNodeUser `description:"审批人信息"`
 }
 
-type KnowledgeApproveListResp struct {
-	List   []*KnowledgeApproveItemOrmResp
+type KnowledgeResourceApproveListResp struct {
+	List   []*KnowledgeResourceApproveItemOrmResp
 	Paging *paging.PagingItem
 }

models/knowledge_approve/response/knowledge_approve_message.go

@@ -2,23 +2,23 @@ package response
 
 import "github.com/rdlucklib/rdluck_tools/paging"
 
-// KnowledgeApproveMessageListResp 审批消息列表响应体
-type KnowledgeApproveMessageListResp struct {
-	List        []*KnowledgeApproveMessageItem
+// KnowledgeResourceApproveMessageListResp 审批消息列表响应体
+type KnowledgeResourceApproveMessageListResp struct {
+	List        []*KnowledgeResourceApproveMessageItem
 	Paging      *paging.PagingItem `description:"分页数据"`
 	UnreadTotal int                `description:"消息未读数"`
 }
 
-// KnowledgeApproveMessageItem 报告审批消息信息
-type KnowledgeApproveMessageItem struct {
-	Id                 int
-	SendUserId         int    `description:"发送人ID"`
-	ReceiveUserId      int    `description:"接收者ID"`
-	Content            string `description:"消息内容"`
-	Remark             string `description:"备注信息"`
-	KnowledgeApproveId int    `description:"审批ID"`
-	ApproveState       int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-	IsRead             int    `description:"是否已读：0-未读；1-已读"`
-	CreateTime         string `description:"创建时间"`
-	ModifyTime         string `description:"修改时间"`
+// KnowledgeResourceApproveMessageItem 报告审批消息信息
+type KnowledgeResourceApproveMessageItem struct {
+	Id                         int
+	SendUserId                 int    `description:"发送人ID"`
+	ReceiveUserId              int    `description:"接收者ID"`
+	Content                    string `description:"消息内容"`
+	Remark                     string `description:"备注信息"`
+	KnowledgeResourceApproveId int    `description:"审批ID"`
+	ApproveState               int    `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
+	IsRead                     int    `description:"是否已读：0-未读；1-已读"`
+	CreateTime                 string `description:"创建时间"`
+	ModifyTime                 string `description:"修改时间"`
 }

routers/commentsRouter.go

@@ -5164,6 +5164,132 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "Approve",
+            Router: `/approve`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "Cancel",
+            Router: `/cancel`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "CheckApproveOpen",
+            Router: `/classify/check_open`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "ClassifyList",
+            Router: `/classify/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "MessageList",
+            Router: `/message/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "MessageRead",
+            Router: `/message/read`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveController"],
+        beego.ControllerComments{
+            Method: "Refuse",
+            Router: `/refuse`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"],
+        beego.ControllerComments{
+            Method: "Add",
+            Router: `/flow/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/flow/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"],
+        beego.ControllerComments{
+            Method: "Edit",
+            Router: `/flow/edit`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/flow/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge_approve:KnowledgeApproveFlowController"],
+        beego.ControllerComments{
+            Method: "Remove",
+            Router: `/flow/remove`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers/report_approve:ReportApproveController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/report_approve:ReportApproveController"],
         beego.ControllerComments{
             Method: "Approve",

services/knowledge_approve/constant.go

@@ -3,8 +3,6 @@ package knowledge_approve
 // 看板状态
 const (
 	KnowledgeStateUnpublished = 1 // 未公开
-	// BiStatePublished   = 2 // 已发布
-	// BiStateWaitSubmit  = 3 // 待提交
 	KnowledgeStateWaitApprove = 4 // 待审批
 	KnowledgeStateRefused     = 5 // 已驳回
 	KnowledgeStatePass        = 6 // 已通过
@@ -25,8 +23,8 @@ const (
 
 // 报告审批状态
 const (
-	KnowledgeApproveStateApproving = 1 // 待审批
-	KnowledgeApproveStatePass      = 2 // 已审批
-	KnowledgeApproveStateRefuse    = 3 // 已驳回
-	KnowledgeApproveStateCancel    = 4 // 已撤销
+	KnowledgeResourceApproveStateApproving = 1 // 待审批
+	KnowledgeResourceApproveStatePass      = 2 // 已审批
+	KnowledgeResourceApproveStateRefuse    = 3 // 已驳回
+	KnowledgeResourceApproveStateCancel    = 4 // 已撤销
 )

services/knowledge_approve/knowledge_approve_flow.go

@@ -2,7 +2,7 @@ package knowledge_approve
 
 import (
 	"encoding/json"
-	"eta_gn/eta_api/models/bi_dashboard"
+	"eta_gn/eta_api/models/knowledge"
 	knowledge_approve "eta_gn/eta_api/models/knowledge_approve"
 	"eta_gn/eta_api/models/knowledge_approve/request"
 	"eta_gn/eta_api/models/knowledge_approve/response"
@@ -11,29 +11,30 @@ import (
 	"time"
 )
 
-// GetKnowledgeApproveFlowList 获取BI审批流列表
-func GetKnowledgeApproveFlowList(condition string, pars []interface{}, startSize, pageSize int) (items []*response.KnowledgeApproveFlowItem, total int, msg string, err error) {
-	total, err = knowledge_approve.GetKnowledgeApproveFlowCountByCondition(condition, pars)
+// GetKnowledgeResourceApproveFlowList 获取知识资源审批流列表
+func GetKnowledgeResourceApproveFlowList(condition string, pars []interface{}, startSize, pageSize int) (items []*response.KnowledgeResourceApproveFlowItem, total int, msg string, err error) {
+	total, err = knowledge_approve.GetKnowledgeResourceApproveFlowCountByCondition(condition, pars)
 	if err != nil {
 		msg = "获取审批流程列表失败"
 		return
 	}
 	if total == 0 {
-		items = make([]*response.KnowledgeApproveFlowItem, 0)
+		items = make([]*response.KnowledgeResourceApproveFlowItem, 0)
 		return
 	}
-	flowList, err := knowledge_approve.GetKnowledgeApproveFlowByCondition(condition, pars, startSize, pageSize)
+	flowList, err := knowledge_approve.GetKnowledgeResourceApproveFlowByCondition(condition, pars, startSize, pageSize)
 	if err != nil {
 		msg = "获取审批流程列表失败"
 		return
 	}
-	items = toKnowledgeApproveFlowItem(flowList)
+	items = toKnowledgeResourceApproveFlowItem(flowList)
 	return
 }
 
-// SaveKnowledgeApproveFlow 保存审批流
-func SaveKnowledgeApproveFlow(flow *request.KnowledgeApproveFlowSaveReq) (ok bool, msg string, err error) {
-	classifyInfo, err := bi_dashboard.GetBiDashboardClassifyById(flow.ClassifyId)
+// SaveKnowledgeResourceApproveFlow 保存审批流
+func SaveKnowledgeResourceApproveFlow(flow *request.KnowledgeResourceApproveFlowSaveReq) (ok bool, msg string, err error) {
+	obj := new(knowledge.KnowledgeClassify)
+	classifyInfo, err := obj.GetClassifyById(flow.ClassifyId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
 			msg = "保存审批流失败, 分类不存在"
@@ -42,30 +43,30 @@ func SaveKnowledgeApproveFlow(flow *request.KnowledgeApproveFlowSaveReq) (ok boo
 		msg = "保存审批流失败"
 		return
 	}
-	if flow.KnowledgeApproveFlowId == 0 {
-		tmp, er := knowledge_approve.GetKnowledgeApproveFlowByClassifyId(flow.ClassifyId)
+	if flow.KnowledgeResourceApproveFlowId == 0 {
+		tmp, er := knowledge_approve.GetKnowledgeResourceApproveFlowByClassifyId(flow.ClassifyId)
 		if er != nil && !utils.IsErrNoRow(er) {
 			msg = "保存审批流失败"
 			err = er
 			return
 		}
-		if tmp != nil && tmp.KnowledgeApproveFlowId > 0 {
+		if tmp != nil && tmp.KnowledgeResourceApproveFlowId > 0 {
 			msg = "保存审批流失败, 分类下已存在审批流"
 			err = fmt.Errorf("分类下已存在审批流")
 			return
 		}
 
-		t := &knowledge_approve.KnowledgeApproveFlow{
+		t := &knowledge_approve.KnowledgeResourceApproveFlow{
 			FlowName:     flow.FlowName,
 			ClassifyId:   flow.ClassifyId,
-			ClassifyName: classifyInfo.BiDashboardClassifyName,
+			ClassifyName: classifyInfo.ClassifyName,
 			CurrVersion:  1,
 			CreateTime:   time.Now(),
 			ModifyTime:   time.Now(),
 		}
-		knowledgeFlowNodeItems := make([]*knowledge_approve.KnowledgeApproveNode, 0)
+		knowledgeFlowNodeItems := make([]*knowledge_approve.KnowledgeResourceApproveNode, 0)
 		for _, node := range flow.Nodes {
-			knowledgeFlowNode := new(knowledge_approve.KnowledgeApproveNode)
+			knowledgeFlowNode := new(knowledge_approve.KnowledgeResourceApproveNode)
 			knowledgeFlowNode.ApproveType = node.ApproveType
 			knowledgeFlowNode.CurrVersion = t.CurrVersion
 			userBytes, er := json.Marshal(node.Users)
@@ -85,13 +86,13 @@ func SaveKnowledgeApproveFlow(flow *request.KnowledgeApproveFlowSaveReq) (ok boo
 		}
 		ok = true
 	} else {
-		resFlow, er := knowledge_approve.GetKnowledgeApproveFlowById(flow.KnowledgeApproveFlowId)
+		resFlow, er := knowledge_approve.GetKnowledgeResourceApproveFlowById(flow.KnowledgeResourceApproveFlowId)
 		if er != nil {
 			msg = "保存审批流失败"
 			err = er
 			return
 		}
-		ok, err = CheckDeleteKnowledgeApproveFlow(resFlow.KnowledgeApproveFlowId)
+		ok, err = CheckDeleteKnowledgeResourceApproveFlow(resFlow.KnowledgeResourceApproveFlowId)
 		if err != nil {
 			msg = "保存审批流失败"
 			return
@@ -109,9 +110,9 @@ func SaveKnowledgeApproveFlow(flow *request.KnowledgeApproveFlowSaveReq) (ok boo
 		resFlow.ModifyTime = time.Now()
 		updateCols = append(updateCols, "modify_time", "curr_version")
 
-		knowledgeFlowNodeItems := make([]*knowledge_approve.KnowledgeApproveNode, 0)
+		knowledgeFlowNodeItems := make([]*knowledge_approve.KnowledgeResourceApproveNode, 0)
 		for _, node := range flow.Nodes {
-			knowledgeFlowNode := new(knowledge_approve.KnowledgeApproveNode)
+			knowledgeFlowNode := new(knowledge_approve.KnowledgeResourceApproveNode)
 			knowledgeFlowNode.ApproveType = node.ApproveType
 			knowledgeFlowNode.CurrVersion = resFlow.CurrVersion
 			userBytes, er := json.Marshal(node.Users)
@@ -135,14 +136,14 @@ func SaveKnowledgeApproveFlow(flow *request.KnowledgeApproveFlowSaveReq) (ok boo
 	return
 }
 
-// GetKnowledgeApproveFlowDetail 获取审批流详情
-func GetKnowledgeApproveFlowDetail(flowId int) (detail *response.KnowledgeApproveFlowDetailResp, msg string, err error) {
-	flowInfo, err := knowledge_approve.GetKnowledgeApproveFlowById(flowId)
+// GetKnowledgeResourceApproveFlowDetail 获取审批流详情
+func GetKnowledgeResourceApproveFlowDetail(flowId int) (detail *response.KnowledgeResourceApproveFlowDetailResp, msg string, err error) {
+	flowInfo, err := knowledge_approve.GetKnowledgeResourceApproveFlowById(flowId)
 	if err != nil {
 		msg = "获取审批流详情失败"
 		return
 	}
-	flowNodes, err := knowledge_approve.GetKnowledgeApproveNodeByFlowIdAndVersionId(flowId, flowInfo.CurrVersion)
+	flowNodes, err := knowledge_approve.GetKnowledgeResourceApproveNodeByFlowIdAndVersionId(flowId, flowInfo.CurrVersion)
 	if err != nil {
 		msg = "获取审批流详情失败"
 		return
@@ -155,9 +156,9 @@ func GetKnowledgeApproveFlowDetail(flowId int) (detail *response.KnowledgeApprov
 	return
 }
 
-// DeleteKnowledgeApproveFlow 删除审批流
-func DeleteKnowledgeApproveFlow(flowId int) (ok bool, msg string, err error) {
-	ok, err = CheckDeleteKnowledgeApproveFlow(flowId)
+// DeleteKnowledgeResourceApproveFlow 删除审批流
+func DeleteKnowledgeResourceApproveFlow(flowId int) (ok bool, msg string, err error) {
+	ok, err = CheckDeleteKnowledgeResourceApproveFlow(flowId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
 			msg = "删除审批流失败, 审批流不存在"
@@ -171,8 +172,8 @@ func DeleteKnowledgeApproveFlow(flowId int) (ok bool, msg string, err error) {
 		return
 	}
 
-	t := &knowledge_approve.KnowledgeApproveFlow{
-		KnowledgeApproveFlowId: flowId,
+	t := &knowledge_approve.KnowledgeResourceApproveFlow{
+		KnowledgeResourceApproveFlowId: flowId,
 	}
 	err = t.Delete()
 	if err != nil {
@@ -183,19 +184,19 @@ func DeleteKnowledgeApproveFlow(flowId int) (ok bool, msg string, err error) {
 	return
 }
 
-// CheckDeleteKnowledgeApproveFlow 检查是否可以删除审批流
-func CheckDeleteKnowledgeApproveFlow(flowId int) (ok bool, err error) {
-	flowInfo, err := knowledge_approve.GetKnowledgeApproveFlowById(flowId)
+// CheckDeleteKnowledgeResourceApproveFlow 检查是否可以删除审批流
+func CheckDeleteKnowledgeResourceApproveFlow(flowId int) (ok bool, err error) {
+	flowInfo, err := knowledge_approve.GetKnowledgeResourceApproveFlowById(flowId)
 	if err != nil {
 		return
 	}
 	// 检查是否存在还未审批的知识资源
-	approveList, err := knowledge_approve.GetKnowledgeApproveByFlowIdAndVersionId(flowInfo.KnowledgeApproveFlowId, flowInfo.CurrVersion)
+	approveList, err := knowledge_approve.GetKnowledgeResourceApproveByFlowIdAndVersionId(flowInfo.KnowledgeResourceApproveFlowId, flowInfo.CurrVersion)
 	if err != nil {
 		return
 	}
 	for _, v := range approveList {
-		if v.State == KnowledgeApproveStateApproving {
+		if v.State == KnowledgeResourceApproveStateApproving {
 			return false, nil
 		}
 	}
@@ -204,35 +205,35 @@ func CheckDeleteKnowledgeApproveFlow(flowId int) (ok bool, err error) {
 	return
 }
 
-func toKnowledgeApproveFlowItem(src []*knowledge_approve.KnowledgeApproveFlow) (res []*response.KnowledgeApproveFlowItem) {
-	res = make([]*response.KnowledgeApproveFlowItem, 0, len(src))
+func toKnowledgeResourceApproveFlowItem(src []*knowledge_approve.KnowledgeResourceApproveFlow) (res []*response.KnowledgeResourceApproveFlowItem) {
+	res = make([]*response.KnowledgeResourceApproveFlowItem, 0, len(src))
 	for _, item := range src {
-		res = append(res, &response.KnowledgeApproveFlowItem{
-			KnowledgeApproveFlowId: item.KnowledgeApproveFlowId,
-			FlowName:               item.FlowName,
-			ClassifyId:             item.ClassifyId,
-			ClassifyName:           item.ClassifyName,
-			CurrVersion:            item.CurrVersion,
-			CreateTime:             item.CreateTime.Format(utils.FormatDateTime),
-			ModifyTime:             item.ModifyTime.Format(utils.FormatDateTime),
+		res = append(res, &response.KnowledgeResourceApproveFlowItem{
+			KnowledgeResourceApproveFlowId: item.KnowledgeResourceApproveFlowId,
+			FlowName:                       item.FlowName,
+			ClassifyId:                     item.ClassifyId,
+			ClassifyName:                   item.ClassifyName,
+			CurrVersion:                    item.CurrVersion,
+			CreateTime:                     item.CreateTime.Format(utils.FormatDateTime),
+			ModifyTime:                     item.ModifyTime.Format(utils.FormatDateTime),
 		})
 	}
 	return
 }
 
-func FormatFlowAndNodesItem2Detail(flowItem *knowledge_approve.KnowledgeApproveFlow, nodeItems []*knowledge_approve.KnowledgeApproveNode) (detail *response.KnowledgeApproveFlowDetailResp, err error) {
+func FormatFlowAndNodesItem2Detail(flowItem *knowledge_approve.KnowledgeResourceApproveFlow, nodeItems []*knowledge_approve.KnowledgeResourceApproveNode) (detail *response.KnowledgeResourceApproveFlowDetailResp, err error) {
 	if flowItem == nil {
 		return
 	}
-	detail = new(response.KnowledgeApproveFlowDetailResp)
-	detail.KnowledgeApproveFlowId = flowItem.KnowledgeApproveFlowId
+	detail = new(response.KnowledgeResourceApproveFlowDetailResp)
+	detail.KnowledgeResourceApproveFlowId = flowItem.KnowledgeResourceApproveFlowId
 	detail.FlowName = flowItem.FlowName
 	detail.ClassifyId = flowItem.ClassifyId
 	detail.CreateTime = utils.TimeTransferString(utils.FormatDateTime, flowItem.CreateTime)
 	detail.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, flowItem.ModifyTime)
-	detail.Nodes = make([]*response.KnowledgeApproveNodeItem, 0)
+	detail.Nodes = make([]*response.KnowledgeResourceApproveNodeItem, 0)
 	for _, v := range nodeItems {
-		t, e := FormatKnowledgeApproveNode2Item(v)
+		t, e := FormatKnowledgeResourceApproveNode2Item(v)
 		if e != nil {
 			err = fmt.Errorf("format node err: %s", e.Error())
 			return
@@ -242,8 +243,8 @@ func FormatFlowAndNodesItem2Detail(flowItem *knowledge_approve.KnowledgeApproveF
 	return
 }
 
-func ModifyKnowledgeApproveFlowClassify(classifyId int, classifyName string) (err error) {
-	flow, err := knowledge_approve.GetKnowledgeApproveFlowByClassifyId(classifyId)
+func ModifyKnowledgeResourceApproveFlowClassify(classifyId int, classifyName string) (err error) {
+	flow, err := knowledge_approve.GetKnowledgeResourceApproveFlowByClassifyId(classifyId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}

services/knowledge_approve/knowledge_approve_message.go

@@ -8,13 +8,13 @@ import (
 	"time"
 )
 
-func GetKnowledgeApproveMessage(adminId, startSize, pageSize int) (list []*response.KnowledgeApproveMessageItem, total, unread int, msg string, err error) {
-	cond := fmt.Sprintf(` AND %s = ?`, knowledge_approve.KnowledgeApproveMessageCols.ReceiveUserId)
+func GetKnowledgeResourceApproveMessage(adminId, startSize, pageSize int) (list []*response.KnowledgeResourceApproveMessageItem, total, unread int, msg string, err error) {
+	cond := fmt.Sprintf(` AND %s = ?`, knowledge_approve.KnowledgeResourceApproveMessageCols.ReceiveUserId)
 	pars := make([]interface{}, 0)
 	pars = append(pars, adminId)
-	order := fmt.Sprintf(`%s ASC, %s DESC`, knowledge_approve.KnowledgeApproveMessageCols.IsRead, knowledge_approve.KnowledgeApproveMessageCols.CreateTime)
+	order := fmt.Sprintf(`%s ASC, %s DESC`, knowledge_approve.KnowledgeResourceApproveMessageCols.IsRead, knowledge_approve.KnowledgeResourceApproveMessageCols.CreateTime)
 
-	messageOb := new(knowledge_approve.KnowledgeApproveMessage)
+	messageOb := new(knowledge_approve.KnowledgeResourceApproveMessage)
 	total, e := messageOb.GetCountByCondition(cond, pars)
 	if e != nil {
 		msg = "获取失败"
@@ -28,12 +28,12 @@ func GetKnowledgeApproveMessage(adminId, startSize, pageSize int) (list []*respo
 		return
 	}
 	for _, v := range tmpList {
-		t := FormatKnowledgeApproveMessage2Item(v)
+		t := FormatKnowledgeResourceApproveMessage2Item(v)
 		list = append(list, t)
 	}
 
 	// 未读消息数
-	cond += fmt.Sprintf(` AND %s = ?`, knowledge_approve.KnowledgeApproveMessageCols.IsRead)
+	cond += fmt.Sprintf(` AND %s = ?`, knowledge_approve.KnowledgeResourceApproveMessageCols.IsRead)
 	pars = append(pars, 0)
 	unreadTotal, e := messageOb.GetCountByCondition(cond, pars)
 	if e != nil {
@@ -46,7 +46,7 @@ func GetKnowledgeApproveMessage(adminId, startSize, pageSize int) (list []*respo
 }
 
 func ReadKnowledgeMessage(msgId int, adminId int) (msg string, err error) {
-	messageOb := new(knowledge_approve.KnowledgeApproveMessage)
+	messageOb := new(knowledge_approve.KnowledgeResourceApproveMessage)
 	messageItem, e := messageOb.GetItemById(msgId)
 	if e != nil {
 		if utils.IsErrNoRow(e) {
@@ -69,9 +69,9 @@ func ReadKnowledgeMessage(msgId int, adminId int) (msg string, err error) {
 	return
 }
 
-// FormatKnowledgeApproveMessage2Item 格式化报告审批消息
-func FormatKnowledgeApproveMessage2Item(origin *knowledge_approve.KnowledgeApproveMessage) (item *response.KnowledgeApproveMessageItem) {
-	item = new(response.KnowledgeApproveMessageItem)
+// FormatKnowledgeResourceApproveMessage2Item 格式化报告审批消息
+func FormatKnowledgeResourceApproveMessage2Item(origin *knowledge_approve.KnowledgeResourceApproveMessage) (item *response.KnowledgeResourceApproveMessageItem) {
+	item = new(response.KnowledgeResourceApproveMessageItem)
 	if origin == nil {
 		return
 	}
@@ -80,7 +80,7 @@ func FormatKnowledgeApproveMessage2Item(origin *knowledge_approve.KnowledgeAppro
 	item.ReceiveUserId = origin.ReceiveUserId
 	item.Content = origin.Content
 	item.Remark = origin.Remark
-	item.KnowledgeApproveId = origin.KnowledgeApproveId
+	item.KnowledgeResourceApproveId = origin.KnowledgeResourceApproveId
 	item.ApproveState = origin.ApproveState
 	item.IsRead = origin.IsRead
 	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)

services/knowledge_approve/knowledge_approve_node.go

@@ -7,19 +7,19 @@ import (
 	"fmt"
 )
 
-// FormatKnowledgeApproveNode2Item 格式化报告审批节点信息
-func FormatKnowledgeApproveNode2Item(origin *knowledge_approve.KnowledgeApproveNode) (item *response.KnowledgeApproveNodeItem, err error) {
+// FormatKnowledgeResourceApproveNode2Item 格式化报告审批节点信息
+func FormatKnowledgeResourceApproveNode2Item(origin *knowledge_approve.KnowledgeResourceApproveNode) (item *response.KnowledgeResourceApproveNodeItem, err error) {
 	if origin == nil {
 		return
 	}
-	item = new(response.KnowledgeApproveNodeItem)
-	item.KnowledgeApproveNodeId = origin.KnowledgeApproveNodeId
-	item.KnowledgeApproveFlowId = origin.KnowledgeApproveFlowId
+	item = new(response.KnowledgeResourceApproveNodeItem)
+	item.KnowledgeResourceApproveNodeId = origin.KnowledgeResourceApproveNodeId
+	item.KnowledgeResourceApproveFlowId = origin.KnowledgeResourceApproveFlowId
 	item.PrevNodeId = origin.PrevNodeId
 	item.NextNodeId = origin.NextNodeId
 	item.NodeType = origin.NodeType
 	item.ApproveType = origin.ApproveType
-	item.Users = make([]*response.KnowledgeApproveNodeUser, 0)
+	item.Users = make([]*response.KnowledgeResourceApproveNodeUser, 0)
 	if origin.Users != "" {
 		e := json.Unmarshal([]byte(origin.Users), &item.Users)
 		if e != nil {