fix

controller/contract/pre_register.go

@@ -78,14 +78,34 @@ func (rg *PreRegisterController) List(c *gin.Context) {
 		resp.FailMsg("获取失败", "获取预登记列表失败, Err: "+e.Error(), c)
 		return
 	}
+	serviceMap := make(map[int]string, 0)
+	registerIds := make([]int, 0)
 	for i := range list {
 		list[i].UnitName = unitMap[list[i].CurrencyUnit]
+		registerIds = append(registerIds, list[i].ContractRegisterId)
+	}
+
+	if len(registerIds) > 0 {
+		serviceMap, _, e = fmsService.GetContractServiceNameFormat(registerIds)
+		if e != nil {
+			resp.FailMsg("获取失败", e.Error(), c)
+			return
+		}
+	}
+
+	respList := make([]*fms.ContractPreRegisterList, 0)
+
+	for _, v := range list {
+		item := new(fms.ContractPreRegisterList)
+		item.ContractPreRegisterItem = v
+		item.ServicesName = serviceMap[v.ContractRegisterId]
+		respList = append(respList, item)
 	}
 
 	page.SetTotal(total)
 	baseData := new(base.BaseData)
 	baseData.SetPage(page)
-	baseData.SetList(list)
+	baseData.SetList(respList)
 	resp.OkData("获取成功", baseData, c)
 }
 
@@ -257,6 +277,7 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 		//预登记列表
 		pp := &fms.ContractPreRegister{
 			ContractRegisterId: ob.ContractRegisterId,
+			CompanyName:        req.CompanyName,
 			InvoiceType:        req.RegisterType,
 			InvoiceDate:        registerDate,
 			AdminId:            int(adminInfo.AdminId),

models/fms/contract_pre_register.go

@@ -11,6 +11,7 @@ import (
 type ContractPreRegister struct {
 	PreRegisterId      int       `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
 	ContractRegisterId int       `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
+	CompanyName        string    `json:"company_name" description:"客户名称"`
 	Amount             float64   `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
 	OriginAmount       float64   `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
 	CurrencyUnit       string    `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
@@ -44,7 +45,7 @@ func (c *ContractPreRegister) TableName() string {
 type ContractPreRegisterItem struct {
 	PreRegisterId      int     `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
 	ContractRegisterId int     `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
-	ContractStatus     int     `json:"contract_status" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
+	CompanyName        string    `json:"company_name" description:"客户名称"`
 	Amount             float64 `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
 	OriginAmount       float64 `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
 	CurrencyUnit       string  `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
@@ -64,6 +65,7 @@ type ContractPreRegisterItem struct {
 	IsPrePay           int     `gorm:"column:is_pre_pay" json:"is_pre_pay" description:"是否预付款: 0-不是; 1-是"`
 	StartDate          string  `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
 	EndDate            string  `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
+	AdminId            int       `gorm:"column:admin_id" json:"admin_id" description:"操作人ID"`
 	CreateTime         string  `gorm:"column:create_time" json:"create_time" description:"创建时间"`
 }
 
@@ -72,6 +74,7 @@ func formatContractPreRegister2Item(item *ContractPreRegister) (formatItem *Cont
 	formatItem = new(ContractPreRegisterItem)
 	formatItem.PreRegisterId = item.PreRegisterId
 	formatItem.ContractRegisterId = item.ContractRegisterId
+	formatItem.CompanyName = item.CompanyName
 	formatItem.Amount = item.Amount
 	formatItem.OriginAmount = item.OriginAmount
 	formatItem.CurrencyUnit = item.CurrencyUnit
@@ -86,6 +89,7 @@ func formatContractPreRegister2Item(item *ContractPreRegister) (formatItem *Cont
 	formatItem.Remark = item.Remark
 	formatItem.IsPrePay = item.IsPrePay
 	formatItem.ServiceProductId = item.ServiceProductId
+	formatItem.AdminId  = item.AdminId
 	formatItem.CreateTime = utils.TimeTransferString(utils.FormatDateTime, item.CreateTime)
 	return
 }
@@ -156,3 +160,9 @@ func formatContractPreRegister2ItemList(list []*ContractPreRegister) (itemList [
 	}
 	return
 }
+
+// ContractPreRegisterList 预登记列表
+type ContractPreRegisterList struct {
+	*ContractPreRegisterItem
+	ServicesName string                 `json:"services" description:"套餐名称"`
+}