fix: 开票到款备注、导出套餐备注

controller/contract/register.go

@@ -682,6 +682,7 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 					InvoiceDate:        t,
 					AdminId:            int(adminInfo.AdminId),
 					AdminName:          adminInfo.RealName,
+					Remark:             req.AmountList[i].Remark,
 				}
 				v.Set()
 				newInvoice = append(newInvoice, v)
@@ -1002,7 +1003,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 	for i := range permissionList {
 		row2Title = append(row2Title, permissionList[i].PermissionName)
 	}
-	row2Title = append(row2Title, "市场策略", "财富管理", "开始时间", "到期时间", "2022年合同金额", "约定付款时间", "签订日",
+	row2Title = append(row2Title, "市场策略", "财富管理", "套餐备注", "开始时间", "到期时间", "2022年合同金额", "约定付款时间", "签订日",
 		"签订月", "合同状态", "合同编号", "备注")
 	for i := range row2Title {
 		v := titleRow2.AddCell()
@@ -1110,6 +1111,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(col6)
 
 		// 其他信息
+		dataRow.AddCell().SetString(v.ServiceRemark)                                     // 套餐备注
 		dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.StartDate)) // 开始时间
 		dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.EndDate))   // 到期时间
 		dataRow.AddCell().SetString(fmt.Sprint("￥", v.ContractAmount))                   // 2022年合同金额

models/fms/contract_invoice.go

@@ -120,6 +120,7 @@ type ContractInvoiceSaveItem struct {
 	InvoiceId   int     `json:"invoice_id" description:"开票ID"`
 	Amount      float64 `json:"amount" description:"开票金额/到款金额"`
 	InvoiceDate string  `json:"invoice_date" description:"开票日期/到款月"`
+	Remark      string  `json:"remark" description:"备注"`
 }
 
 // GetContractInvoiceItemList 获取开票到款列表