fix

controller/census/invoice_payment.go

@@ -1678,6 +1678,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				serviceAmountMap[v.ContractRegisterId] = make(map[int]*fms.ContractServiceAmount)
 			}
 			serviceAmountMap[v.ContractRegisterId][v.ProductId] = v
+			fmt.Println("ServiceAmount,ProductId",v.ServiceAmount,v.ProductId)
 		}
 
 		// 获取汇总数据IDs, 用于查询合计数据
@@ -1737,6 +1738,34 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			for _, v := range summaryList {
 				NotInvoiceSummaryMap[v.RegisterId] = append(NotInvoiceSummaryMap[v.RegisterId], v)
 			}
+			for _, v := range summaryList {
+				if v.ProductIds == "1,2" && len(NotInvoiceSummaryMap[v.RegisterId]) < 2 {
+					if v.ServiceProductId == 1 {
+						item := fms.NotInvoicePaymentSummaryItem{
+							NotInvoicedAmountTotal: serviceAmountMap[v.ContractRegisterId][2].ServiceAmount,
+							ServiceProductId:       2,
+						}
+						item.SellerId = v.SellerId
+						item.SellerName = v.SellerName
+						item.RaiSellerId = v.RaiSellerId
+						item.RaiSellerName = v.RaiSellerName
+
+						NotInvoiceSummaryMap[v.RegisterId] = append(NotInvoiceSummaryMap[v.RegisterId], &item)
+					} else {
+
+						item := fms.NotInvoicePaymentSummaryItem{
+							NotInvoicedAmountTotal: serviceAmountMap[v.ContractRegisterId][1].ServiceAmount,
+							ServiceProductId:       1,
+						}
+						item.SellerId = v.SellerId
+						item.SellerName = v.SellerName
+						item.RaiSellerId = v.RaiSellerId
+						item.RaiSellerName = v.RaiSellerName
+
+						NotInvoiceSummaryMap[v.RegisterId] = append(NotInvoiceSummaryMap[v.RegisterId], &item)
+					}
+				}
+			}
 
 			// 重组汇总数据
 			summaryMap := make(map[int][]*fms.NotPaymentCensusInfo)
@@ -1766,8 +1795,11 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 
 			for registerId, list := range NotInvoiceSummaryMap {
 				for _, v := range list {
-					v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
-
+					fmt.Println("v.ServiceProductId:",v.ServiceProductId)
+					fmt.Println("v.NotInvoicedAmountTotal:",v.NotInvoicedAmountTotal)
+					if v.NotInvoicedAmountTotal == 0 {
+						v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
+					}
 					if v.SellerId > 0 && v.RaiSellerId > 0 {
 						if v.ServiceProductId == 1 {
 							v.SellerGroupId = sellerMap[v.SellerId].GroupId
@@ -1778,11 +1810,11 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 							v.RaiSellerGroupName = sellerMap[v.RaiSellerId].GroupName
 							v.SellerType = sellerTypeMap[sellerMap[v.RaiSellerId].DepartmentId]
 						}
-					} else if v.SellerId > 0 && v.RaiSellerId == 0{
+					} else if v.SellerId > 0 && v.RaiSellerId == 0 {
 						v.SellerGroupId = sellerMap[v.SellerId].GroupId
 						v.SellerGroupName = sellerMap[v.SellerId].GroupName
 						v.SellerType = sellerTypeMap[sellerMap[v.SellerId].DepartmentId]
-					}else if v.SellerId == 0 && v.RaiSellerId > 0 {
+					} else if v.SellerId == 0 && v.RaiSellerId > 0 {
 						v.RaiSellerGroupId = sellerMap[v.RaiSellerId].GroupId
 						v.RaiSellerGroupName = sellerMap[v.RaiSellerId].GroupName
 						v.SellerType = sellerTypeMap[sellerMap[v.RaiSellerId].DepartmentId]
@@ -2104,7 +2136,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 	for i := range registerList {
 		queryRegisterIds = append(queryRegisterIds, registerList[i].ContractRegisterId)
 	}
-	fmt.Println("queryRegisterIds:",queryRegisterIds)
+	fmt.Println("queryRegisterIds:", queryRegisterIds)
 
 	//fmt.Println("queryRegisterIds:",queryRegisterIds)
 	results := new(fms.NotInvoicePaymentCensusResp)
@@ -2429,7 +2461,7 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	}
 
 	// 数据表头
-	rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间","合同金额","金额单位", "未开票金额", "套餐类型", "销售", "销售组别","销售类型"}
+	rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间", "合同金额", "金额单位", "未开票金额", "套餐类型", "销售", "销售组别", "销售类型"}
 	titleRow := sheet.AddRow()
 	for i := range rowTitle {
 		v := titleRow.AddCell()
@@ -2441,20 +2473,22 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	// 填充数据
 	for i, v := range incomeSummaryItemList {
 		dataRow := sheet.AddRow()
-		dataRow.AddCell().SetString(strconv.Itoa(i)) 	//序号
-		dataRow.AddCell().SetString(v.CompanyName)            // 客户名称
-		dataRow.AddCell().SetString(v.ContractCode)            // 合同编号
-		dataRow.AddCell().SetString(v.StartDate)            // 合同开始时间
-		dataRow.AddCell().SetString(v.EndDate)            // 合同结束时间
-		dataRow.AddCell().SetString(v.ContractCode)            // 合同金额
-		dataRow.AddCell().SetString(v.UnitName)            // 金额单位
+		cell := dataRow.AddCell()
+		cell.VMerge = 1
+		cell.SetString(strconv.Itoa(i + 1)) //序号
+		cell.SetString(v.CompanyName)       // 客户名称
+		cell.SetString(v.ContractCode)      // 合同编号
+		cell.SetString(v.StartDate)         // 合同开始时间
+		cell.SetString(v.EndDate)           // 合同结束时间
+		cell.SetString(v.ContractCode)      // 合同金额
+		cell.SetString(v.UnitName)          // 金额单位
 		sheet.AddRow()
 		for _, item := range v.NotInvoiceList {
-			dataRow.AddCell().SetString(fmt.Sprintf("%.2f",item.NotInvoicedAmountTotal))            // 未开票金额
-			dataRow.AddCell().SetString(strconv.Itoa(item.ServiceProductId))            // 套餐类型
-			dataRow.AddCell().SetString(item.SellerName)            // 销售
-			dataRow.AddCell().SetString(item.SellerGroupName)            // 销售组别
-			dataRow.AddCell().SetString(item.SellerType)            // 销售类型
+			cell.SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountTotal)) // 未开票金额
+			cell.SetString(strconv.Itoa(item.ServiceProductId))              // 套餐类型
+			cell.SetString(item.SellerName)                                  // 销售
+			cell.SetString(item.SellerGroupName)                             // 销售组别
+			cell.SetString(item.SellerType)                                  // 销售类型
 		}
 	}
 
@@ -2679,4 +2713,3 @@ func ExportNotPaymentCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
 	http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
 }
-