fix: 报告审批

models/report_approve/report_approve.go

@@ -317,7 +317,7 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, b.*
+	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.approve_time AS handle_time, b.*
 		FROM report_approve_record AS a
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
 		WHERE 1 = 1 %s %s

services/report_approve.go

@@ -206,15 +206,6 @@ func SubmitReportApprove(reportType, reportId int, reportTitle string, firstId,
 		err = fmt.Errorf("首个审批节点有误")
 		return
 	}
-	//firstNode, e := report_approve.FormatReportApproveNode2Item(firstNodeItem)
-	//if e != nil {
-	//	err = fmt.Errorf("首个审批节点信息有误, Err: %s", e.Error())
-	//	return
-	//}
-	//if len(firstNode.Users) == 0 {
-	//	err = fmt.Errorf("首个审批节点审批人信息有误")
-	//	return
-	//}
 
 	// 审批信息
 	now := time.Now().Local()
@@ -237,65 +228,10 @@ func SubmitReportApprove(reportType, reportId int, reportTitle string, firstId,
 		err = fmt.Errorf("生成审批信息失败, Err: %s", e.Error())
 		return
 	}
+	approveId = newApprove.ReportApproveId
 
 	// 生成节点审批记录
 	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.ReportApproveId, sysAdminId, sysAdminName)
-	//func BuildNextNodeRecordAndMsg(approveNodeItem *report_approve.ReportApproveNode, approveId, sysAdminId int, sysAdminName string)
-	//BuildNextNodeRecordAndMsg
-
-	// 根据节点审批方式生成审批记录
-	//newRecords := make([]*report_approve.ReportApproveRecord, 0)
-	//sort.Slice(firstNode.Users, func(k, j int) bool {
-	//	return firstNode.Users[k].Sort < firstNode.Users[j].Sort
-	//})
-	//for _, u := range firstNode.Users {
-	//	r := new(report_approve.ReportApproveRecord)
-	//	r.State = report_approve.ReportApproveStateApproving
-	//	r.NodeId = firstNode.ReportApproveNodeId
-	//	r.PrevNodeId = firstNode.PrevNodeId
-	//	r.NextNodeId = firstNode.NextNodeId
-	//	r.ApproveType = firstNode.ApproveType
-	//	r.ApproveUserId = u.UserId
-	//	r.ApproveUserName = u.UserName
-	//	r.ApproveUserSort = u.Sort
-	//	r.CreateTime = now
-	//	r.ModifyTime = now
-	//	newRecords = append(newRecords, r)
-	//	// 依次审批仅生成一条记录
-	//	if firstNode.ApproveType == report_approve.NodeApproveTypeRoll {
-	//		break
-	//	}
-	//}
-	//
-	//// 新增审批和审批记录
-	//if e = newApprove.CreateApproveAndRecord(newApprove, newRecords); e != nil {
-	//	err = fmt.Errorf("CreateApproveAndRecord err: %s", e.Error())
-	//	return
-	//}
-	//approveId = newApprove.ReportApproveId
-	//
-	//// 推送审批消息
-	//go func() {
-	//	messageOb := new(report_approve.ReportApproveMessage)
-	//	messages := make([]*report_approve.ReportApproveMessage, 0)
-	//	for _, v := range newRecords {
-	//		m := new(report_approve.ReportApproveMessage)
-	//		m.SendUserId = sysAdminId
-	//		m.ReceiveUserId = v.ApproveUserId
-	//		m.Content = "您有新的待办任务"
-	//		m.Remark = fmt.Sprintf("%s提交的【研报审批】需要您审批，请及时处理", sysAdminName)
-	//		m.ReportApproveId = newApprove.ReportApproveId
-	//		m.ApproveState = report_approve.ReportApproveStateApproving
-	//		m.CreateTime = now
-	//		m.ModifyTime = now
-	//		messages = append(messages, m)
-	//	}
-	//	e = messageOb.CreateMulti(messages)
-	//	if e != nil {
-	//		utils.FileLog.Info(fmt.Sprintf("SubmitReportApprove messages err: %s", e.Error()))
-	//		return
-	//	}
-	//}()
 	return
 }