Merge branch 'new_2.6'

controller/census/invoice_payment.go

@@ -889,9 +889,9 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				totalGroupErr = fmt.Errorf("获取货币列表失败, Err: %s", e.Error())
 				return
 			}
-			unitMap := make(map[string]string)
+			//unitMap := make(map[string]string)
 			for i := range currencyList {
-				unitMap[currencyList[i].Code] = currencyList[i].UnitName
+				//unitMap[currencyList[i].Code] = currencyList[i].UnitName
 				invoiceCurrencyTotals = append(invoiceCurrencyTotals, &fms.InvoiceListCurrencyTotal{
 					Name:     currencyList[i].Name,
 					UnitName: currencyList[i].UnitName,
@@ -1660,9 +1660,8 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 		for _, v := range serviceAmountList {
 			if _, ok := serviceAmountMap[v.ContractRegisterId]; !ok {
 				serviceAmountMap[v.ContractRegisterId] = make(map[int]*fms.ContractServiceAmount)
+				serviceAmountMap[v.ContractRegisterId][v.ProductId] = v
 			}
-			serviceAmountMap[v.ContractRegisterId][v.ProductId] = v
-			fmt.Println("ServiceAmount,ProductId", v.ServiceAmount, v.ProductId, v.ContractRegisterId)
 		}
 
 		// 获取汇总数据IDs, 用于查询合计数据