ziwen 2 anni fa
parent
commit
bcc76193bc
2 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. 3 3
      controller/contract/register.go
  2. 2 3
      models/fms/contract_register.go

+ 3 - 3
controller/contract/register.go

@@ -345,7 +345,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 	ob.ServiceRemark = req.ServiceRemark
 	ob.HasPayment = req.HasPayment
 	ob.HasInvoice = req.HasInvoice
-	ob.ActualCompanyName = req.ActualCompanyName
+	ob.ActualPayCompanies = req.ActualPayCompanies
 	ob.Set()
 	updateCols := []string{
 		"ContractCode", "RelateContractCode", "RelateContractMainCode", "CrmContractId", "ContractSource",
@@ -657,7 +657,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 	updateCols := []string{
 		"ProductIds", "ContractCode", "RelateContractCode", "CrmContractId", "ContractSource", "CompanyName",
 		"SellerId", "SellerName", "ContractType", "ContractAmount", "StartDate", "EndDate", "SignDate", "AgreedPayTime", "RaiSellerId", "RaiSellerName",
-		"ContractStatus", "RegisterStatus", "Remark", "ServiceRemark", "HasPayment", "ModifyTime","HasInvoice","ActualCompanyName",
+		"ContractStatus", "RegisterStatus", "Remark", "ServiceRemark", "HasPayment", "ModifyTime","HasInvoice","ActualPayCompanies",
 	}
 	nowTime := time.Now().Local()
 	item.ProductIds = req.ProductIds
@@ -683,7 +683,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 	item.ServiceRemark = req.ServiceRemark
 	item.HasPayment = req.HasPayment
 	item.HasInvoice = req.HasInvoice
-	item.ActualCompanyNames = req.ActualCompanyName
+	item.ActualPayCompanies = req.ActualPayCompanies
 	item.ModifyTime = nowTime
 
 	// 不需要开票到款的直接完成登记, 且不允许进行开票/到款登记

+ 2 - 3
models/fms/contract_register.go

@@ -40,7 +40,7 @@ type ContractRegister struct {
 	HasInvoice             int       `gorm:"column:has_invoice" json:"has_invoice" description:"是否需要开票到款: 0-无; 1-有"`
 	NewCompany             int       `gorm:"column:new_company" json:"new_company" description:"是否为新客户: 0-否; 1-是"`
 	IsDeleted              int       `gorm:"column:is_deleted" json:"is_deleted" description:"是否已删除: 0-正常; 1-已删除"`
-	ActualPayCompanies string    `gorm:"column:actual_pay_companies" json:"actual_pay_companies" description:"合同关联的所有代付方名称, 英文逗号拼接"`
+	ActualPayCompanies     string    `gorm:"column:actual_pay_companies" json:"actual_pay_companies" description:"合同关联的所有代付方名称, 英文逗号拼接"`
 	base.TimeBase
 }
 
@@ -191,10 +191,9 @@ type ContractRegisterAddReq struct {
 	HasInvoice             int                           `json:"has_invoice" description:"是否需要开票到款流程: 0-无; 1-有"`
 	Supplement             int                           `json:"supplement" description:"是否为补录合同: 0-否; 1-是"`
 	ContractRegisterId     int                           `json:"contract_register_id" description:"登记ID"`
-	ActualCompanyName      string                        `json:"actual_company_name" description:"实际使用方"`
 	Services               []ContractServiceAddReq       `json:"services" description:"服务套餐内容"`
 	ServiceAmount          []ContractServiceAmountAddReq `json:"service_amount" description:"服务套餐金额"`
-	ActualPayCompanies string                  `json:"actual_pay_companies" description:"合同关联的所有代付方名称, 英文逗号拼接"`
+	ActualPayCompanies     string                        `json:"actual_pay_companies" description:"合同关联的所有代付方名称, 英文逗号拼接"`
 }
 
 // ContractRegisterEditReq 编辑合同登记请求体