Merge branch 'pool_345' into debug

# Conflicts:
#	models/fms/contract_invoice.go

models/fms/contract_invoice.go

@@ -61,6 +61,7 @@ type ContractInvoiceItem struct {
 	StartDate          string  `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
 	EndDate            string  `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
 	CreateTime         string  `gorm:"column:create_time" json:"create_time" description:"创建时间"`
+	CompanyName        string    `gorm:"column:company_name" json:"company_name" description:"客户名称"`
 }
 
 func (c *ContractInvoice) Create() (err error) {
@@ -233,9 +234,11 @@ type ContractInvoiceListReq struct {
 
 // GetContractInvoiceItemPageList 获取合同开票/到款列表-分页
 func GetContractInvoiceItemPageList(page base.IPage, condition string, pars []interface{}) (count int64, results []*ContractInvoiceItem, err error) {
-	list := make([]*ContractInvoice, 0)
-	query := global.DEFAULT_MYSQL.Table("contract_invoice").
-		Where("is_deleted = 0").
+	list := make([]*ContractInvoiceRespItem, 0)
+	query := global.DEFAULT_MYSQL.Table("contract_invoice AS a").
+		Select("a.*, b.company_name").
+		Joins("JOIN contract_register b ON a.contract_register_id = b.contract_register_id").
+		Where("a.is_deleted = 0").
 		Where(condition, pars...)
 	query.Count(&count)
 	if len(page.GetOrderItemsString()) > 0 {
@@ -252,7 +255,7 @@ func GetContractInvoiceItemPageList(page base.IPage, condition string, pars []in
 }
 
 // formatContractInvoice2Item 格式化ContractInvoiceItem
-func formatContractInvoice2Item(item *ContractInvoice) (formatItem *ContractInvoiceItem) {
+func formatContractInvoice2Item(item *ContractInvoiceRespItem) (formatItem *ContractInvoiceItem) {
 	formatItem = new(ContractInvoiceItem)
 	formatItem.ContractInvoiceId = item.ContractInvoiceId
 	formatItem.ContractRegisterId = item.ContractRegisterId
@@ -269,6 +272,7 @@ func formatContractInvoice2Item(item *ContractInvoice) (formatItem *ContractInvo
 	formatItem.IsPrePay = item.IsPrePay
 	formatItem.ServiceProductId = item.ServiceProductId
 	formatItem.CreateTime = utils.TimeTransferString(utils.FormatDateTime, item.CreateTime)
+	formatItem.CompanyName = item.CompanyName
 	return
 }
 
@@ -578,4 +582,9 @@ func formatContractInvoice2DetailItemList(list []*ContractInvoice) (itemList []*
 		})
 	}
 	return
+}
+
+type ContractInvoiceRespItem struct {
+	ContractInvoice
+	CompanyName        string    `gorm:"column:company_name" json:"company_name" description:"客户名称"`
 }