Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

controllers/bi_approve/bi_approve.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
-	biapprove2 "eta_gn/eta_api/models/bi_approve"
 	"eta_gn/eta_api/models/bi_approve/request"
 	"eta_gn/eta_api/models/bi_approve/response"
 	biapprove "eta_gn/eta_api/services/bi_approve"
@@ -65,10 +64,26 @@ func (this *BiApproveController) List() {
 	}
 	startSize := paging.StartIndex(currentIndex, pageSize)
 
-	var list []*biapprove2.BiApproveItemOrm
+	var list []*response.BiApproveItemOrmResp
 	var total int
 	var msg string
 	var err error
+
+	classifyList, msg, err := biapprove.GetBiClassifyAll()
+	if err != nil {
+		if msg != "" {
+			br.Msg = msg
+		} else {
+			br.Msg = "获取审批列表成功"
+		}
+		br.ErrMsg = "获取分类列表失败, Err: " + err.Error()
+		return
+	}
+	classifyMap := make(map[int]string)
+	for _, v := range classifyList {
+		classifyMap[v.BiDashboardClassifyId] = v.BiDashboardClassifyName
+	}
+
 	switch listType {
 	case 1:
 		list, total, msg, err = biapprove.ProcessingBiApprove(sysUser.AdminId, classifyId, timeType, sortField, sortRule, startSize, pageSize, sysUser.RealName, startTime, endTime, keyword)
@@ -89,6 +104,9 @@ func (this *BiApproveController) List() {
 		br.ErrMsg = "获取审批列表失败, Err: " + err.Error()
 		return
 	}
+	for _, v := range list {
+		v.ClassifyName = classifyMap[v.ClassifyId]
+	}
 
 	resp := new(response.BiApproveListResp)
 	page := paging.GetPaging(currentIndex, pageSize, total)

models/bi_approve/bi_approve.go

@@ -131,6 +131,7 @@ func GetApprovingBiApprovePageList(cond string, pars []interface{}, orderRule st
 		JOIN bi_approve AS b ON a.bi_approve_id = b.bi_approve_id AND a.node_id = b.curr_node_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
+	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/bi_approve/bi_approve_node.go

@@ -28,7 +28,7 @@ var BiApproveNodeCols = struct {
 	ApproveType     string
 	Users           string
 	CurrVersion     string
-	CreateTime      string
+	CreatedTime     string
 }{
 	BiApproveNodeId: "bi_approve_node_id",
 	BiApproveFlowId: "bi_approve_flow_id",
@@ -38,7 +38,7 @@ var BiApproveNodeCols = struct {
 	ApproveType:     "approve_type",
 	Users:           "users",
 	CurrVersion:     "curr_version",
-	CreateTime:      "create_time",
+	CreatedTime:     "created_time",
 }
 
 func (b *BiApproveNode) TableName() string {
@@ -50,7 +50,7 @@ func (m *BiApproveNode) GetItemsByCondition(condition string, pars []interface{}
 	if len(fieldArr) == 0 {
 		fields = `*`
 	}
-	order := `ORDER BY create_time DESC, bi_approve_node_id ASC`
+	order := `ORDER BY created_time DESC, bi_approve_node_id ASC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}

models/bi_approve/response/bi_approve.go

@@ -64,3 +64,27 @@ type BiApproveDetailNodeUserRecord struct {
 	ApproveRemark     string `description:"审批备注"`
 	ApproveTime       string `description:"审批时间"`
 }
+
+type BiApproveItemOrmResp struct {
+	BiApproveId       int    `description:"审批ID"`
+	BiApproveRecordId int    `description:"审批记录ID"`
+	BiId              int    `description:"报告ID"`
+	BiTitle           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/bi_approve/response/bi_approve_flow.go

@@ -1,8 +1,6 @@
 package response
 
 import (
-	biapprove "eta_gn/eta_api/models/bi_approve"
-
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -43,6 +41,6 @@ type BiApproveNodeItem struct {
 }
 
 type BiApproveListResp struct {
-	List   []*biapprove.BiApproveItemOrm
+	List   []*BiApproveItemOrmResp
 	Paging *paging.PagingItem
 }

services/bi_approve/bi_approve.go

@@ -380,7 +380,7 @@ func BuildNextNodeRecordAndMsg(approveNodeItem *biapprove.BiApproveNode, approve
 			m.SendUserId = sysAdminId
 			m.ReceiveUserId = v.ApproveUserId
 			m.Content = "您有新的待办任务"
-			m.Remark = fmt.Sprintf("%s提交的【研报审批】需要您审批，请及时处理", sysAdminName)
+			m.Remark = fmt.Sprintf("%s提交的【看板审批】需要您审批，请及时处理", sysAdminName)
 			m.BiApproveId = approveId
 			m.ApproveState = BiApproveStateApproving
 			m.CreateTime = now
@@ -402,7 +402,7 @@ func updateBiApproveState(biId, approveId, state int) (err error) {
 	updateCols := []string{"State", "ModifyTime"}
 	BiItem, e := bi_dashboard.GetDashboardById(biId)
 	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取智能研报失败, Err: %s", e.Error())
+		err = fmt.Errorf("获取智能看板失败, Err: %s", e.Error())
 		return
 	}
 	if BiItem != nil && BiItem.BiDashboardId > 0 {
@@ -426,7 +426,7 @@ func updateBiApproveState(biId, approveId, state int) (err error) {
 	return
 }
 
-func ProcessingBiApprove(adminId, classifyId, timeType, sortField, sortRule, startSize, pageSize int, adminName, startTime, endTime, keyword string) (ormList []*biapprove.BiApproveItemOrm, respTotal int, msg string, err error) {
+func ProcessingBiApprove(adminId, classifyId, timeType, sortField, sortRule, startSize, pageSize int, adminName, startTime, endTime, keyword string) (respList []*response.BiApproveItemOrmResp, respTotal int, msg string, err error) {
 	cond := fmt.Sprintf(` AND a.%s = ? AND b.%s = ? AND a.%s = ?`, biapprove.BiApproveRecordCols.State, biapprove.BiApproveCols.State, biapprove.BiApproveRecordCols.ApproveUserId)
 	pars := make([]interface{}, 0)
 	pars = append(pars, BiApproveStateApproving, BiApproveStateApproving, adminId)
@@ -488,13 +488,14 @@ func ProcessingBiApprove(adminId, classifyId, timeType, sortField, sortRule, sta
 		err = fmt.Errorf("GetApprovingBiApprovePageList err: %s", e.Error())
 		return
 	}
+
+	respList = toBiApproveItemOrmResp(list)
 	respTotal = total
-	ormList = list
 	return
 }
 
 // SolvedBiApprove 已处理的审批
-func SolvedBiApprove(adminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize int, adminName, startTime, endTime, keyword string) (ormList []*biapprove.BiApproveItemOrm, respTotal int, msg string, err error) {
+func SolvedBiApprove(adminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize int, adminName, startTime, endTime, keyword string) (respList []*response.BiApproveItemOrmResp, respTotal int, msg string, err error) {
 	cond := fmt.Sprintf(` AND a.%s = ? AND a.%s IN (?)`, biapprove.BiApproveRecordCols.ApproveUserId, biapprove.BiApproveRecordCols.NodeState)
 	pars := make([]interface{}, 0)
 	pars = append(pars, adminId, []int{BiApproveStatePass, BiApproveStateRefuse})
@@ -563,12 +564,12 @@ func SolvedBiApprove(adminId, classifyId, timeType, sortField, sortRule, approve
 		v.RecordState = v.NodeState
 		v.ApproveTime = v.NodeApproveTime
 	}
-	ormList = list
+	respList = toBiApproveItemOrmResp(list)
 	respTotal = total
 	return
 }
 
-func MyApplyBiApproves(adminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize int, adminName, startTime, endTime, keyword string) (ormList []*biapprove.BiApproveItemOrm, respTotal int, msg string, err error) {
+func MyApplyBiApproves(adminId, classifyId, timeType, sortField, sortRule, approveState, startSize, pageSize int, adminName, startTime, endTime, keyword string) (respList []*response.BiApproveItemOrmResp, respTotal int, msg string, err error) {
 	cond := fmt.Sprintf(` AND a.%s = ?`, biapprove.BiApproveCols.ApplyUserId)
 	pars := make([]interface{}, 0)
 	pars = append(pars, adminId)
@@ -632,11 +633,11 @@ func MyApplyBiApproves(adminId, classifyId, timeType, sortField, sortRule, appro
 		err = fmt.Errorf("GetApplyBiApprovePageList err: %s", e.Error())
 		return
 	}
-	ormList = list
+	respList = toBiApproveItemOrmResp(list)
 	return
 }
 
-func GetApproveDetail(approveId int) (resp response.BiApproveDetail, msg string, err error) {
+func GetApproveDetail(approveId int) (resp *response.BiApproveDetail, msg string, err error) {
 	approveItem, e := biapprove.GetBiApproveById(approveId)
 	if e != nil {
 		if utils.IsErrNoRow(e) {
@@ -754,6 +755,7 @@ func GetApproveDetail(approveId int) (resp response.BiApproveDetail, msg string,
 	detail.Bi.BiId = approveItem.BiId
 	detail.Bi.BiTitle = approveItem.BiTitle
 	detail.Bi.BiClassify = cnClassifyIdName[approveItem.ClassifyId]
+	resp = detail
 	return
 }
 
@@ -858,7 +860,7 @@ func RefuseBiApprove(approveItem *biapprove.BiApprove, recordItem *biapprove.BiA
 		messageItem.SendUserId = sysAdminId
 		messageItem.ReceiveUserId = approveItem.ApplyUserId
 		messageItem.Content = "您提交的审批被驳回"
-		messageItem.Remark = "您提交的【研报审批】已被驳回"
+		messageItem.Remark = "您提交的【看板审批】已被驳回"
 		messageItem.BiApproveId = approveItem.BiApproveId
 		messageItem.ApproveState = BiApproveStateRefuse
 		messageItem.CreateTime = now
@@ -1061,7 +1063,7 @@ func CheckBiCurrState(classifyId, operate int) (state int, err error) {
 }
 
 // SubmitBiApprove 提交审批
-func SubmitBiApprove(reportId int, reportTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
+func SubmitBiApprove(biId int, reportTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
 	// 默认内部审批, 如果是走的第三方审批, 那么仅修改状态
 	confMap, e := models.GetBusinessConf()
 	if e != nil {
@@ -1117,7 +1119,7 @@ func SubmitBiApprove(reportId int, reportTitle string, classifyId int, sysAdminI
 	// 审批信息
 	now := time.Now().Local()
 	newApprove := new(biapprove.BiApprove)
-	newApprove.BiId = reportId
+	newApprove.BiId = biId
 	newApprove.BiTitle = reportTitle
 	newApprove.ClassifyId = classifyId
 	newApprove.State = BiApproveStateApproving
@@ -1139,3 +1141,41 @@ func SubmitBiApprove(reportId int, reportTitle string, classifyId int, sysAdminI
 	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.BiApproveId, sysAdminId, sysAdminName)
 	return
 }
+
+func toBiApproveItemOrmResp(src []*biapprove.BiApproveItemOrm) (res []*response.BiApproveItemOrmResp) {
+	for _, v := range src {
+		r := new(response.BiApproveItemOrmResp)
+		r.BiApproveId = v.BiApproveId
+		r.BiApproveRecordId = v.BiApproveRecordId
+		r.BiId = v.BiId
+		r.BiTitle = v.BiTitle
+		r.ClassifyId = v.ClassifyId
+		r.State = v.State
+		r.RecordState = v.RecordState
+		r.FlowId = v.FlowId
+		r.FlowVersion = v.FlowVersion
+		r.StartNodeId = v.StartNodeId
+		r.CurrNodeId = v.CurrNodeId
+		r.ApplyUserId = v.ApplyUserId
+		r.ApplyUserName = v.ApplyUserName
+		r.ApproveRemark = v.ApproveRemark
+		r.ApproveTime = v.ApproveTime.Format(utils.FormatDateTime)
+		r.HandleTime = v.HandleTime.Format(utils.FormatDateTime)
+		r.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
+		r.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
+		r.NodeState = v.NodeState
+		res = append(res, r)
+	}
+	return
+}
+
+func GetBiClassifyAll() (list []*bi_dashboard.BiDashboardClassify, msg string, err error) {
+	ClassifyList, e := bi_dashboard.GetBiDashboardClassifyAllList()
+	if e != nil {
+		msg = "获取失败"
+		err = fmt.Errorf("GetBiDashboardClassifyAllList err: %s", e.Error())
+		return
+	}
+	list = ClassifyList
+	return
+}