fix:审批单新增消息体字段

controllers/approval.go

@@ -674,7 +674,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 			} else {
 				approvalStatus = 3
 			}
-			go services.AddCompanyApprovalMessage(sysUser.AdminId, approvalItem.ApplyUserId, req.CompanyId, approvalItem.CompanyApprovalId, 2, 1, approvalStatus, companyProduct.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sysUser.AdminId, approvalItem.ApplyUserId, req.CompanyId, approvalItem.CompanyApprovalId, 2, 1, approvalStatus, companyProduct.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	}
 	c.OkWithMessage("审批操作成功")

models/tables/company_approval_message/company_approval_message.go

@@ -21,6 +21,7 @@ type CompanyApprovalMessage struct {
 	ApprovalStatus    int       `description:"审批结果:1:待审批，2:已审批，3:已驳回"`
 	OperationStatus   int       `description:"消息状态:1:待审批，2:已审批"`
 	MessageType       int       `description:"1:申请消息，2:审批结果"`
+	MessageInfo       string    `description:"消息主要内容，json数据"`
 }
 
 //添加审批消息
@@ -125,6 +126,17 @@ type CompanyApprovalMessageReadReq struct {
 	Id int `description:"消息id"`
 }
 
+// MessageInfo 消息主要内容
+type MessageInfo struct {
+	CompanyName          string `json:"company_name"`
+	ProductId            int    `json:"product_id"`
+	CompanyProductStatus string `json:"company_product_status"`
+	Title                string `json:"title"`
+	Content              string `json:"content"`
+	UserId               uint64 `json:"user_id"`
+	UserName             string `json:"user_name"`
+}
+
 //变更为消息已读状态
 func ModifyCompanyApprovalMessageStatus(companyApprovalMessageId int) (err error) {
 	o := orm.NewOrm()
@@ -141,7 +153,7 @@ func ModifyAllCompanyApprovalMessageStatus(receiveUserId, sourceType int) (err e
 	return
 }
 
-//消息作废
+// CancelCompanyApprovalMessage 消息作废
 func CancelCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE company_approval_message SET message_status=2,modify_time=NOW() 

services/company_approval/company_approval.go

@@ -308,7 +308,7 @@ func Reject(approvalRecord *contract_approval_record.ContractApprovalRecord, opU
 		//content := contractInfo.CompanyName + " 合同模板已驳回"
 		content := companyInfo.CompanyName + " " + recordInfo.ApproveContent + "审批驳回"
 		approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-		go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 3, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 3, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 	}
 	return
 }
@@ -392,7 +392,7 @@ func Approved(approvalRecord *contract_approval_record.ContractApprovalRecord, o
 		//待办通知（通知销售已经审核通过了）
 		{
 			approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-			go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		// 客户单审批后的异步操作（修改客户单信息、修改合同权限等）
@@ -479,7 +479,7 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 		//待办通知
 		{
 			approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//客户单审批后的异步操作（修改客户单信息、修改合同权限等）
@@ -552,7 +552,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
 
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/company_approval_message.go

@@ -8,8 +8,19 @@ import (
 	"time"
 )
 
+// MessageInfo 消息主要内容
+type MessageInfo struct {
+	CompanyName          string `json:"company_name"`
+	ProductId            int    `json:"product_id"`
+	CompanyProductStatus string `json:"company_product_status"`
+	Title                string `json:"title"`
+	Content              string `json:"content"`
+	UserId               uint64 `json:"user_id"`
+	UserName             string `json:"user_name"`
+}
+
 // AddCompanyApprovalMessage 添加待办消息
-func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, msgType, sourceType, approvalStatus int, companyName, remark, content, mobile string) (err error) {
+func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, msgType, sourceType, approvalStatus int, companyName, remark, content, mobile, messageInfo string) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("异常提醒:"+utils.RunMode, "给用户发送消息失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
@@ -35,6 +46,7 @@ func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyAp
 	msgItem.MessageType = msgType           //1:申请消息，2:审批结果，3：消息通知
 	msgItem.SourceType = sourceType         //消息来源，1:客户，2：合同，3：用印
 	msgItem.ApprovalStatus = approvalStatus //审批状态,1:待审批，2:已审批，3:已驳回
+	msgItem.MessageInfo = messageInfo       //消息主要内容，json数据
 	err = company_approval_message.AddCompanyApprovalMessage(msgItem)
 	if mobile != "" {
 		//跳转地址

services/contract/contract_approval.go

@@ -374,7 +374,7 @@ func Reject(contractInfo *contract.Contract, approvalInfo *contract_approval.Con
 	{
 		content := contractInfo.CompanyName + " 合同模板已驳回"
 		approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-		go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 3, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 3, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 
 		//发送消息给所有的抄送人
 		//go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 3, contractInfo.CompanyName, content)
@@ -445,7 +445,7 @@ func Approved(contractInfo *contract.Contract, approvalInfo *contract_approval.C
 		{
 			content := contractInfo.CompanyName + " 合同模板已审核"
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -533,7 +533,7 @@ func approved(contractInfo *contract.Contract, contractApprovalRecord *contract_
 		{
 			content := contractInfo.CompanyName + " 合同模板已审核"
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -610,7 +610,7 @@ func approvedByCc(approvedRemark string, sourceContractApprovalRecord *contract_
 		//待办通知
 		{
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(sourceContractApprovalRecord.ApproveUserId, contractInfo.SellerId, 0, sourceContractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceContractApprovalRecord.ApproveUserId, contractInfo.SellerId, 0, sourceContractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -681,7 +681,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		}
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, 2, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, 2, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/seal/approval.go

@@ -43,8 +43,8 @@ func Apply(sealInfo *seal.Seal) (err error) {
 
 // GetFlowTypeBySealType 根据盖章类型(多选,逗号拼接)获取审批流的类型
 func GetFlowTypeBySealType(sealType string) (flowType int) {
-	flowType = 5	// 合同章
-	longFlow := "公章,法人章"	// 盖章类型包含其中之一则审批流变成6
+	flowType = 5         // 合同章
+	longFlow := "公章,法人章" // 盖章类型包含其中之一则审批流变成6
 	sealTypeArr := strings.Split(sealType, ",")
 	for _, itemType := range sealTypeArr {
 		if strings.Contains(longFlow, itemType) {
@@ -314,7 +314,7 @@ func Reject(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApprova
 	{
 		content := sealInfo.CompanyName + " 用印已驳回"
 		approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-		go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 
 		//发送消息给所有的抄送人
 		//go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 3, sealInfo.CompanyName, content)
@@ -457,7 +457,7 @@ func Approved(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppro
 		{
 			content := sealInfo.CompanyName + " 用印已审核"
 			approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	} else {
 		//获取下级节点信息
@@ -532,7 +532,7 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 		{
 			content = sealInfo.CompanyName + " 用印已审核"
 			approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, sealInfo.UserId, 0, sourceApprovalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, sealInfo.UserId, 0, sourceApprovalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	} else {
 		//获取下级节点信息
@@ -607,7 +607,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		}
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/seal/seal.go

@@ -106,7 +106,7 @@ func Edit(sealId, userId, contractId, fileNum int, use, companyName, userCompany
 	sealInfo.FileUrl = fileUrl
 	sealInfo.FileNum = fileNum
 	sealInfo.ContractId = contractId
-	sealInfo.CreateTime = time.Now()	// 重提更新提交时间
+	sealInfo.CreateTime = time.Now() // 重提更新提交时间
 	sealInfo.ModifyTime = time.Now()
 	sealInfo.Status = "待提交" //用印状态
 
@@ -242,7 +242,7 @@ func checkEdit(sealInfo *seal.Seal, updateCol []string, approvalRecordId int, co
 	if sysUser != nil {
 		sysUserMobile = sysUser.Mobile
 	}
-	go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile)
+	go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile, "")
 	return
 }
 
@@ -314,7 +314,7 @@ func Invalid(sealId int, opUser *custom.AdminWx, isInvalidContract bool) (err er
 				if sysUser != nil {
 					sysUserMobile = sysUser.Mobile
 				}
-				go services.AddCompanyApprovalMessage(opUser.AdminId, contractApprovalRecord.ApproveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile)
+				go services.AddCompanyApprovalMessage(opUser.AdminId, contractApprovalRecord.ApproveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile, "")
 
 			}
 		}