fix 申请类型调整，新增类型为6的补充协议

controllers/approval.go

@@ -452,7 +452,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 	var approveStatus, approveContent string
 
 	if req.Status == 1 { //通过
-		//申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新
+		//申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新，6：正式客户补充协议
 		if approvalItem.ApplyMethod == 1 { //试用转正式
 			//获取合同信息
 			contract, err := company_contract.GetCompanyContractDetail(req.CompanyId, productId, req.CompanyContractId)
@@ -523,7 +523,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 				c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 				return
 			}
-		} else if approvalItem.ApplyMethod == 5 { //正式客户申请服务更新
+		} else if approvalItem.ApplyMethod == 5 || approvalItem.ApplyMethod == 6 { //正式客户申请服务更新
 			//获取合同信息
 			contract, err := company_contract.GetCompanyContractDetail(req.CompanyId, productId, req.CompanyContractId)
 			if err != nil {

controllers/message.go

@@ -199,7 +199,7 @@ func (c *MessageCommon) MessageList() {
 		approvalInfo := company_approval_message.ApprovalInfo{}
 		if messageInfo.SourceType == 1 {
 			if companyApproval, ok := companyApprovalMap[messageInfo.CompanyApprovalId]; ok {
-				//申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新
+				//申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新，6：正式客户补充协议
 				switch companyApproval.ApplyMethod {
 				case 1:
 					approvalInfo.Type = "申请转正"
@@ -210,7 +210,9 @@ func (c *MessageCommon) MessageList() {
 				case 4:
 					approvalInfo.Type = "原销售申请领取流失客户"
 				case 5:
-					approvalInfo.Type = "正式客户申请服务更新"
+					approvalInfo.Type = "续约申请"
+				case 6:
+					approvalInfo.Type = "补充协议"
 				}
 				approvalInfo.ApplyName = companyApproval.ApplyRealName
 				approvalInfo.ApplyTime = companyApproval.CreateTime

models/tables/company_approval/company_approval.go

@@ -21,7 +21,7 @@ type CompanyApproval struct {
 	ApproveRealName     string    `description:"审批人姓名"`
 	ApproveTime         time.Time `description:"审批时间"`
 	ApproveContent      string    `description:"待审内容"`
-	ApplyMethod         int       `description:"申请类型：1:试用->正式,2:冻结—>试用,3:流失—>正式,4:试用延期,5:原销售申请领取流失客户，6:正式客户申请服务更新"`
+	ApplyMethod         int       `description:"申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新，6：正式客户补充协议"`
 	ApplyReasons        string    `description:"申请原因"`
 	ApplyUserId         int       `description:"申请人"`
 	ApplyRealName       string    `description:"申请人姓名"`
@@ -99,7 +99,7 @@ type CompanyApprovalList struct {
 	Status              string `description:"客户状态"`
 	ApproveContent      string `description:"待审内容"`
 	ApproveStatus       string `description:"当前状态"`
-	ApplyMethod         int    `description:"申请类型：申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新"`
+	ApplyMethod         int    `description:"申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新，6：正式客户补充协议"`
 	ApplyReasons        string `description:"申请理由"`
 	FreezeStartDate     string `description:"冻结开始日期"`
 	FreezeEndDate       string `description:"冻结结束日期"`
@@ -630,7 +630,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 			//如果 需要更新 字段 为 true，那么就去更新
 			if needUpdate {
 				sql = `update company_report_permission set end_date=?,last_updated_time=now(),modify_time=now(),company_contract_id=?,status=? where company_report_permission_id=? `
-				_, tmpErr := o.Raw(sql, pv.EndDate, pv.CompanyContractId, pv.Status, nowPermission.CompanyReportPermissionId).Exec()
+				_, tmpErr := o.Raw(sql, pv.EndDate, pv.CompanyContractId, "正式", nowPermission.CompanyReportPermissionId).Exec()
 				err = tmpErr
 				if err != nil {
 					return

models/tables/contract_approval/contract_approval.go

@@ -723,7 +723,7 @@ type CompanyApprovalList struct {
 	CompanyProductStatus string `description:"客户状态"`
 	ApproveContent       string `description:"待审内容"`
 	ApproveStatus        string `description:"当前状态"`
-	ApplyMethod          int    `description:"申请类型：1:试用->正式,2:冻结—>试用,3:流失—>正式,4:试用延期,5:原销售申请领取流失客户，6:正式客户申请服务更新"`
+	ApplyMethod          int    `description:"申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新，6：正式客户补充协议"`
 	ApplyReasons         string `description:"申请理由"`
 	FreezeStartDate      string `description:"冻结开始日期"`
 	FreezeEndDate        string `description:"冻结结束日期"`

services/company_approval/company_approval.go

@@ -66,7 +66,9 @@ func Apply(companyApprovalId int, messageContent string) (err error) {
 	case 4:
 		applyContent = `原销售申领客户`
 	case 5:
-		applyContent = `服务更新`
+		applyContent = `续约申请`
+	case 6:
+		applyContent = `补充协议`
 	}
 
 	contractDetailByte, err := json.Marshal(recodeInfo)
@@ -668,7 +670,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 			err = errors.New("原销售申请领取流失客户失败,Err:" + tmpErr.Error())
 			return
 		}
-	case 5: //正式客户申请服务更新
+	case 5, 6: //正式客户申请服务更新
 		//获取合同信息
 		contractInfo, tmpErr := company_contract.GetCompanyContractDetail(recodeInfo.CompanyId, recodeInfo.ProductId, recodeInfo.CompanyContractId)
 		if tmpErr != nil {