Merge branch 'fms_2.5' into debug

controller/census/invoice_payment.go

@@ -662,7 +662,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		queryRegisterIds = append(queryRegisterIds, registerList[i].ContractRegisterId)
 	}
 
-	fmt.Println("queryRegisterIds:",queryRegisterIds)
+	//fmt.Println("queryRegisterIds:",queryRegisterIds)
 	results := new(fms.InvoicePaymentCensusResp)
 	if len(queryRegisterIds) > 0 {
 		// 获取汇总数据IDs, 用于查询合计数据
@@ -674,7 +674,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 			return
 		}
 
-		fmt.Println("summaryIds:",summaryIds)
+		//fmt.Println("summaryIds:",summaryIds)
 		var listErr, totalErr, totalGroupErr error
 		wg := sync.WaitGroup{}
 

models/fms/contract_invoice.go

@@ -590,3 +590,8 @@ type ContractInvoiceRespItem struct {
 	ContractInvoice
 	CompanyName string `gorm:"column:company_name" json:"company_name" description:"客户名称"`
 }
+
+func (c *ContractInvoice) FetchByRegisterId(registerId int) (items []*ContractInvoice, err error) {
+	err = global.DEFAULT_MYSQL.Model(c).Where("is_deleted = 0 AND contract_register_id = ?", registerId).Scan(&items).Error
+	return
+}

models/fms/contract_register.go

@@ -711,12 +711,18 @@ func UpdateContractRegisterPre(item *ContractRegister, updateCols []string, serv
 		//}
 	}
 
+	productId := 0
+	if len(invoiceList) > 0 {
+		productId = invoiceList[0].ServiceProductId
+	}
+
 	//更新另一类型的invoice表数据
 	invoiceItem := ContractInvoice{
 		ContractRegisterId: item.ContractRegisterId,
 		StartDate:          item.StartDate,
 		EndDate:            item.EndDate,
 		CurrencyUnit:       item.CurrencyUnit,
+		ServiceProductId:   productId,
 	}
 	tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit"}).Where("ContractRegisterId", item.ContractRegisterId).Updates(invoiceItem)