瀏覽代碼

Merge branch 'pool_458' into debug

ziwen 2 年之前
父節點
當前提交
37731e4bfe
共有 2 個文件被更改,包括 2 次插入0 次删除
  1. 1 0
      controller/census/invoice_payment.go
  2. 1 0
      models/fms/contract_invoice.go

+ 1 - 0
controller/census/invoice_payment.go

@@ -811,6 +811,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.ServicesName = servicesNameMap[registerList[i].ContractRegisterId]
 				v.InvoicePaymentList = summaryMap[registerList[i].SummaryId]
 				v.ContractType = registerList[i].ContractType
+				v.ActualPayCompanies = registerList[i].ActualPayCompanies
 				respList = append(respList, v)
 			}
 		}()

+ 1 - 0
models/fms/contract_invoice.go

@@ -346,6 +346,7 @@ type InvoicePaymentCensusItem struct {
 	EndDate            string                      `json:"end_date" description:"合同结束日期"`
 	ServicesName       string                      `json:"services_name" description:"套餐信息字符串拼接"`
 	ContractType       int                         `json:"contract_type" description:"合同类型: 0-无 1-新签; 2-续约"`
+	ActualPayCompanies string                      `json:"actual_pay_companies" description:"该合同关联的所有代付方, 英文逗号拼接"`
 	InvoicePaymentList []*InvoicePaymentCensusInfo `json:"invoice_payment_list" description:"开票到款列表"`
 }