fix

controller/census/invoice_payment.go

@@ -15,6 +15,7 @@ import (
 	fmsService "hongze/fms_api/services/fms"
 	"hongze/fms_api/utils"
 	"net/http"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -1424,7 +1425,11 @@ func (this *InvoicePaymentController) IncomeList(c *gin.Context) {
 		incomeList = v
 		close(ch)
 	}
-
+	// 是否导出
+	if req.IsExport == 1 {
+		ExportIncomeList(c, incomeList.DataList)
+		return
+	}
 	resp.OkData("获取成功", incomeList, c)
 }
 
@@ -1442,71 +1447,105 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 	//
 	//redisJsonData, redisErr := global.Redis.Get(context.TODO(), key).Result()
 	//if redisErr != nil {
+
+	//获取最新的开票到款日期
+	invoiceItem,err := fms.GetLatestInvoice()
+	if err != nil {
+		err = fmt.Errorf("获取最新的开票或到款日期, Err: %s", err.Error())
+		return
+	}
+
 	var dateSlice []string
-	var totalMoneySlice, prevTotalMoneySlice, yoySlice []float64
+	var totalMoneySlice, prevTotalMoneySlice []float64
+	var yoySlice []string
 	var yearNum, monthNum int
+	var reqStartDate, reqEndDate time.Time
+	historyTime, _ := time.Parse(utils.FormatDate, "2023-03-01")
+
 	if req.StartDate != "" && req.EndDate != "" {
 		st := fmt.Sprint(req.StartDate, "-01 00:00:00")
 		ed := fmt.Sprint(req.EndDate, "-01 23:59:59")
-		startDate,_ := time.Parse(st, utils.FormatDateTime)
-		endDate,_ := time.Parse(ed, utils.FormatDateTime)
-		yearNum = startDate.Year() - endDate.Year()
-		monthNum = int(startDate.Month() - endDate.Month())
+		reqStartDate, _ = time.Parse(utils.FormatDateTime,st)
+		reqEndDate, _ = time.Parse(utils.FormatDateTime, ed)
+		if reqEndDate.After(invoiceItem.InvoiceDate) {
+			yearNum = invoiceItem.InvoiceDate.Year() - reqStartDate.Year()
+			monthNum = int(invoiceItem.InvoiceDate.Month() - 1)
+		} else {
+			yearNum = reqEndDate.Year() - reqStartDate.Year()
+			monthNum = int(reqEndDate.Month() - 1)
+		}
 	} else {
-		yearNum = time.Now().Year() - 2020
-		monthNum = int(time.Now().Month() - 1)
+		yearNum = invoiceItem.InvoiceDate.Year() - 2020
+		monthNum = int(invoiceItem.InvoiceDate.Month() - 1)
 	}
 
 	numMonth := yearNum*12 + monthNum //共存在多少个月
-	if req.ListParam == "1" {
-		numMonth = numMonth/3
-	} else if req.ListParam == "2" {
-		numMonth = numMonth/6
-	} else if req.ListParam == "3" {
-		numMonth = numMonth/12
-	}
+	//if req.ListParam == "1" {
+	//	numMonth = numMonth / 3
+	//} else if req.ListParam == "2" {
+	//	numMonth = numMonth / 6
+	//} else if req.ListParam == "3" {
+	//	numMonth = numMonth / 12
+	//}
 	// 累计值
 	var accumulate float64
-	for i := numMonth; i >= 0; i-- {
-		if req.ListParam == "1" {
-			i = i-2
-		} else if req.ListParam == "2" {
-			i = i-5
-		} else if req.ListParam == "3" {
-			i = i-11
-		}
-		timeNow, _ := time.Parse("2006-01", time.Now().Format("2006-01"))
-		dateSlice = append(dateSlice, timeNow.AddDate(0, -i, 0).Format("06/01"))
+	var historyAccumulate float64
+	fmt.Println("numMonth:",numMonth)
+
+	for i := 0; i <= numMonth; i++ {
+		//timeNow, _ := time.Parse("2006-01", time.Now().Format("2006-01"))
+
+		var endDateTime time.Time
+		var prevEndDateTime time.Time
+		var prevStartDate, prevEndDate string
+		var startDate, endDate string
 		//开始日期
-		startDate := timeNow.AddDate(0, -i, 0).Format("2006-01")
-		prevStartDate := timeNow.AddDate(0, -i-1, 0).Format("2006-01")
+		if req.StartDate != "" && req.EndDate != "" {
+			startDate = reqStartDate.AddDate(0, i, 0).Format("2006-01")
+			prevStartDate = reqStartDate.AddDate(-1, i, 0).Format("2006-01")
+		} else {
+			startDate = invoiceItem.InvoiceDate.AddDate(0, i-numMonth, 0).Format("2006-01")
+			prevStartDate = invoiceItem.InvoiceDate.AddDate(-1, i-numMonth, 0).Format("2006-01")
+		}
 		startDate = fmt.Sprint(startDate, "-01")
 		prevStartDate = fmt.Sprint(prevStartDate, "-01")
+		startDateTime, _ := time.Parse(utils.FormatDate, startDate)
+		prevStartDateTime, _ := time.Parse(utils.FormatDate, prevStartDate)
 
 		//结束日期
-		endDateTime := timeNow.AddDate(0, -i+1, -1)
-		prevEndDateTime := timeNow.AddDate(0, -i, -1)
-		endDate := endDateTime.Format(utils.FormatDate)
-		prevEndDate := prevEndDateTime.Format(utils.FormatDate)
-
-		//因为就算是当月的后续事件还没到，也要计入数据统计，所以不做限制到当天处理
-		//if endDateTime.After(time.Now()) {
-		//	endDate = time.Now().AddDate(0, 0, 1).Format(utils.FormatDate)
-		//} else {
-		//	endDate = fmt.Sprint(endDate, "-01")
-		//}
+		if req.StartDate != "" && req.EndDate != "" {
+			endDateTime = reqStartDate.AddDate(0, i+1, -1)
+			prevEndDateTime = reqStartDate.AddDate(-1, i+1, -1)
+		} else {
+			endDateTime = invoiceItem.InvoiceDate.AddDate(0, i-numMonth+1, -1)
+			prevEndDateTime = invoiceItem.InvoiceDate.AddDate(-1, i-numMonth+1, -1)
+		}
+		endDate = endDateTime.Format(utils.FormatDate)
+		prevEndDate = prevEndDateTime.Format(utils.FormatDate)
+
+
+		dateSlice = append(dateSlice, startDateTime.Format("06/01"))
+
 		cond := `1 = 1`
+		histrtyCond := `1 = 1`
 		pars := make([]interface{}, 0)
+		historyPars := make([]interface{}, 0)
 
 		prevCond := `1 = 1`
+		prevHistoryCond := `1 = 1`
 		prevPars := make([]interface{}, 0)
+		prevHistoryPars := make([]interface{}, 0)
 
 		if req.CompanyType == 1 {
 			cond += ` AND b.new_company = 1 `
 			prevCond += ` AND b.new_company = 1 `
+			histrtyCond += ` AND new_company = 1 `
+			prevHistoryCond += ` AND new_company = 1 `
 		} else if req.CompanyType == 2 {
 			cond += ` AND b.new_company = 0 `
 			prevCond += ` AND b.new_company = 0 `
+			histrtyCond += ` AND new_company = 0 `
+			prevHistoryCond += ` AND new_company = 0 `
 		}
 
 		if req.SellerIds != "" {
@@ -1515,84 +1554,278 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			pars = append(pars, sellerIds, sellerIds)
 			prevCond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
 			prevPars = append(prevPars, sellerIds, sellerIds)
+			histrtyCond += ` AND seller_id in ? `
+			prevHistoryCond += ` AND seller_id in ? `
+			historyPars = append(historyPars, sellerIds)
+			prevHistoryPars = append(prevHistoryPars, sellerIds)
 		}
 
 		{
+			//本期
 			st := fmt.Sprint(startDate, " 00:00:00")
 			ed := fmt.Sprint(endDate, " 23:59:59")
-			cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
-			pars = append(pars, st, ed, st, ed)
-			summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(cond, pars)
-			if e != nil {
-				return
-			}
+			//校验日期，分段查询
+			if startDateTime.After(historyTime) || startDateTime.Equal(historyTime) {
+				//全部走新查询
+				//fmt.Println("新查询")
+				cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
+				pars = append(pars, st, ed, st, ed)
+				summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(cond, pars)
+				if e != nil {
+					return
+				}
 
-			// 开票到款金额合计(换算后)
-			var amountTotal float64
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+
+				if len(summaryIds) > 0 {
+					amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, summaryIds)
+					amountCond += ` AND (b.invoice_time BETWEEN ? AND ?)`
+					amountPars = append(amountPars, st, ed)
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					var amountSum float64
+					for _, result := range results {
+						incomeChart.DataList = append(incomeChart.DataList, result)
+						amountSum += result.Amount
+					}
+					amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					accumulate += amountTotal
+				}
+				if req.ListParam == "4" {
+					totalMoneySlice = append(totalMoneySlice, accumulate)
+				} else {
+					totalMoneySlice = append(totalMoneySlice, amountTotal)
+				}
+			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
+
+				//全部走旧查询
+				//fmt.Println("旧查询")
+				histrtyCond += ` AND (invoice_time BETWEEN ? AND ? )`
+				historyPars = append(historyPars, st, ed)
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
+				if e != nil {
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+					return
+				}
+				var amountSum float64
+				for _, result := range results {
+					incomeChart.DataList = append(incomeChart.DataList, result)
+					amountSum += result.Amount
+				}
+				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+				accumulate += amountTotal
 
-			if len(summaryIds) > 0 {
-				amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
-				amountPars := make([]interface{}, 0)
-				amountPars = append(amountPars, summaryIds)
-				amountSum, e := fms.GetContractSummaryInvoicePaymentAmount(amountCond, amountPars)
+				if req.ListParam == "4" {
+					totalMoneySlice = append(totalMoneySlice, accumulate)
+				} else {
+					totalMoneySlice = append(totalMoneySlice, amountTotal)
+				}
+			} else {
+				//刚好跨过20230301的，各查一部分
+				//fmt.Println("查询3")
+				var historyAmountTotal float64
+				histrtyCond += ` AND (invoice_time BETWEEN ? AND '2023-03-01 23:59:59' ) `
+				historyPars = append(historyPars, st)
+				//// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
 				if e != nil {
-					err = fmt.Errorf("获取汇总金额合计失败, Err: %s", e.Error())
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
 					return
 				}
+				var amountSum float64
+				for _, result := range results {
+					incomeChart.DataList = append(incomeChart.DataList, result)
+					amountSum += result.Amount
+				}
 				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
 				accumulate += amountTotal
+				historyAmountTotal = amountTotal
+
+				cond += ` AND ((c.invoice_time BETWEEN '2023-03-02 00:00:00' AND ?) or (d.invoice_time BETWEEN '2023-03-02 00:00:00' AND ?))`
+				pars = append(pars, ed, ed)
+				summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(cond, pars)
+				if e != nil {
+					return
+				}
+
+				if len(summaryIds) > 0 {
+					amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, summaryIds)
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					var amountSum float64
+					for _, result := range results {
+						incomeChart.DataList = append(incomeChart.DataList, result)
+						amountSum += result.Amount
+					}
+					amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					accumulate += amountTotal
+				}
+				if req.ListParam == "4" {
+					totalMoneySlice = append(totalMoneySlice, accumulate)
+				} else {
+					totalMoneySlice = append(totalMoneySlice, amountTotal+historyAmountTotal)
+				}
+
 			}
-			if req.ListParam == "4"{
-				totalMoneySlice = append(totalMoneySlice, accumulate)
-			}else {
-				totalMoneySlice = append(totalMoneySlice, amountTotal)
-			}
+
 		}
 
 		{ //去年同期，用于计算同比值
-
 			prevSt := fmt.Sprint(prevStartDate, " 00:00:00")
 			prevEd := fmt.Sprint(prevEndDate, " 23:59:59")
-			prevCond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
-			prevPars = append(prevPars, prevSt, prevEd, prevSt, prevEd)
-			prevSummaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(prevCond, prevPars)
-			if e != nil {
-				return
-			}
 
-			// 开票到款金额合计(换算后)
-			var prevAmountTotal float64
+			//校验日期，分段查询
+			if prevStartDateTime.After(historyTime) || prevStartDateTime.Equal(historyTime) {
+				//全部走新查询
+				prevCond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
+				prevPars = append(prevPars, prevSt, prevEd, prevSt, prevEd)
+				prevSummaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(prevCond, prevPars)
+				if e != nil {
+					return
+				}
+
+				// 开票到款金额合计(换算后)
+				var prevAmountTotal float64
+
+				if len(prevSummaryIds) > 0 {
+					amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, prevSummaryIds)
+					amountCond += ` AND (b.invoice_time BETWEEN ? AND ?)`
+					amountPars = append(amountPars, prevSt, prevEd)
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					var amountSum float64
+					for _, result := range results {
+						amountSum += result.Amount
+					}
+					prevAmountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					historyAccumulate += prevAmountTotal
+				}
+				prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal)
+			} else if prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime) {
+				//全部走旧查询
+				prevHistoryCond += ` AND (invoice_time BETWEEN ? AND ?)`
+				prevHistoryPars = append(prevHistoryPars, prevSt, prevEd)
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(prevHistoryCond, prevHistoryPars)
+				if e != nil {
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+					return
+				}
+				var amountSum float64
+				for _, result := range results {
+					amountSum += result.Amount
+				}
+				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+				historyAccumulate += amountTotal
+
+				if req.ListParam == "4" {
+					prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+				} else {
+					prevTotalMoneySlice = append(prevTotalMoneySlice, amountTotal)
+				}
+			} else {
+				//刚好跨过20230301的，各查一部分
+				var historyAmountTotal float64
+				prevHistoryCond += ` AND (invoice_time BETWEEN ? AND '2023-03-01 23:59:59' ) `
+				prevHistoryPars = append(prevHistoryPars, prevSt)
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(prevHistoryCond, prevHistoryPars)
+				if e != nil {
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+					return
+				}
+				var amountSum float64
+				for _, result := range results {
+					amountSum += result.Amount
+				}
+				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+				historyAccumulate += amountTotal
+
 
-			if len(prevSummaryIds) > 0 {
-				amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
-				amountPars := make([]interface{}, 0)
-				amountPars = append(amountPars, prevSummaryIds)
-				amountSum, e := fms.GetContractSummaryInvoicePaymentAmount(amountCond, amountPars)
+				prevCond += ` AND ((c.invoice_time BETWEEN '2023-03-02 00:00:00' AND ?) or (d.invoice_time BETWEEN '2023-03-02 00:00:00' AND ?))`
+				prevPars = append(prevPars, prevEd, prevEd)
+				prevSummaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(prevCond, prevPars)
 				if e != nil {
-					err = fmt.Errorf("获取汇总金额合计失败, Err: %s", e.Error())
 					return
 				}
-				prevAmountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+
+				// 开票到款金额合计(换算后)
+				var prevAmountTotal float64
+
+				if len(prevSummaryIds) > 0 {
+					amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, prevSummaryIds)
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					var amountSum float64
+					for _, result := range results {
+						amountSum += result.Amount
+					}
+					prevAmountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					historyAccumulate += prevAmountTotal
+				}
+				if req.ListParam == "4" {
+					prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+				} else {
+					prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal+historyAmountTotal)
+				}
 			}
-			prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal)
+
+		}
+		if req.ListParam == "1" {
+			i = i + 2
+		} else if req.ListParam == "2" {
+			i = i + 5
+		} else if req.ListParam == "3" {
+			i = i + 11
 		}
 	}
+	fmt.Println("prevTotalMoneySlice:", len(prevTotalMoneySlice))
+	fmt.Println("totalMoneySlice:", len(totalMoneySlice))
 
 	//计算同比值
 	for i := range prevTotalMoneySlice {
 		var yoy float64
-		fmt.Println("1：", prevTotalMoneySlice[i])
-		fmt.Println("2:", totalMoneySlice[i])
-		fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
-		if prevTotalMoneySlice[i] != 0 {
+		var yoyStr string
+		//fmt.Println("1：", prevTotalMoneySlice[i])
+		//fmt.Println("2:", totalMoneySlice[i])
+		//fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
+		if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0{
 			yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
+			yoyStr = fmt.Sprintf("%.4f", yoy)
 		}
-		yoySlice = append(yoySlice, yoy)
+		yoySlice = append(yoySlice, yoyStr)
 	}
 
 	incomeChart.Title = "开票到款统计图"
 	incomeChart.Date = dateSlice
 	incomeChart.TotalMoney = totalMoneySlice
+	incomeChart.PrevTotalMoney = prevTotalMoneySlice
 	incomeChart.Yoy = yoySlice
 
 	//redisJsonData, err := json.Marshal(incomeChart)
@@ -1608,3 +1841,57 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 
 	return
 }
+
+// ExportIncomeList 导出业务收入统计列表
+func ExportIncomeList(c *gin.Context, list []*fms.IncomeSummaryItem) {
+	// 生成Excel文件
+	xlsxFile := xlsx.NewFile()
+	style := xlsx.NewStyle()
+	alignment := xlsx.Alignment{
+		Horizontal: "center",
+		Vertical:   "center",
+		WrapText:   true,
+	}
+	style.Alignment = alignment
+	style.ApplyAlignment = true
+
+	sheetName := "业务收入统计表"
+	sheet, err := xlsxFile.AddSheet(sheetName)
+	if err != nil {
+		resp.FailData("新增Sheet失败", "Err:"+err.Error(), c)
+		return
+	}
+
+	// 数据表头
+	rowTitle := []string{"开票日期", "新客户(1)", "客户名称", "金额", "销售"}
+	titleRow := sheet.AddRow()
+	for i := range rowTitle {
+		v := titleRow.AddCell()
+		v.SetString(rowTitle[i])
+		v.SetStyle(style)
+	}
+	incomeSummaryItemList := make(fms.IncomeSummaryItemList, 0)
+	incomeSummaryItemList = list
+	sort.Sort(incomeSummaryItemList)
+	// 填充数据
+	for _, v := range incomeSummaryItemList {
+		dataRow := sheet.AddRow()
+		dataRow.AddCell().SetString(v.InvoiceDate.Format(utils.FormatDate)) // 开票日期
+		dataRow.AddCell().SetString(strconv.Itoa(v.NewCompany))             // 新客户
+		dataRow.AddCell().SetString(v.CompanyName)                          // 客户名称
+		dataRow.AddCell().SetString(fmt.Sprint(v.Amount))                   // 金额
+		dataRow.AddCell().SetString(v.SellerName)                           // 销售员
+	}
+
+	// 输出文件
+	var buffer bytes.Buffer
+	_ = xlsxFile.Write(&buffer)
+	content := bytes.NewReader(buffer.Bytes())
+	randStr := time.Now().Format(utils.FormatDateTimeUnSpace)
+	fileName := sheetName + randStr + ".xlsx"
+
+	c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
+}
+

controller/crm/company_seller.go

@@ -1,11 +1,13 @@
 package crm
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"hongze/fms_api/controller/resp"
 	"hongze/fms_api/global"
 	"hongze/fms_api/models/crm"
+	"hongze/fms_api/models/fms"
 	crmService "hongze/fms_api/services/crm"
 )
 
@@ -82,5 +84,54 @@ func (rg *CompanySellerController) AllList(c *gin.Context) {
 		FiccSeller: ficcList,
 		RaiSeller:  raiLits,
 	}
+	//e = FIX()
+	//if e != nil {
+	//	resp.FailData("获取销售失败", "Err:"+e.Error(), c)
+	//	return
+	//}
 	resp.OkData("获取成功", respItem, c)
+}
+
+// List
+// @Title 销售列表
+// @Description 销售列表
+// @Success 200 {object} crm.SellerAdminWithGroupList
+// @router /crm/company_seller/team_list [get]
+func (rg *CompanySellerController) TeamList(c *gin.Context) {
+	// 此处调整为只取销售部门的人员, 而不是原先的根据角色取
+	list, e := crmService.GetSellerList()
+	if e != nil {
+		resp.FailData("获取销售失败", "Err:"+e.Error(), c)
+		return
+	}
+
+
+	resp.OkData("获取成功", list, c)
+}
+
+func FIX() (err error) {
+	sellerList, e := crmService.GetSellerDepartmentListWithGroupAndTeam()
+	if e != nil {
+		return
+	}
+	sellerMap := make(map[string]*crm.SellerAdminWithGroupTeam)
+	for i := range sellerList {
+		sellerMap[sellerList[i].SellerName] = sellerList[i]
+	}
+
+	list,err := fms.GetIncomeHistoryList()
+	if err != nil {
+		return
+	}
+	for _, v := range list {
+		fmt.Println("v:", v.IncomeId)
+		if seller, ok := sellerMap[v.SellerName]; ok{
+			v.SellerId = seller.SellerId
+			if e = v.Update([]string{"seller_id"}); e != nil {
+				fmt.Println("更新销售失败, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
 }

models/fms/contract_income_history.go

@@ -0,0 +1,49 @@
+package fms
+
+import (
+	"hongze/fms_api/global"
+	"time"
+)
+
+type ContractIncomeHistory struct {
+	IncomeId    int       `json:"income_id" gorm:"primaryKey;column:income_id"`       //
+	Amount      float64   `json:"amount" gorm:"column:amount"`             // 开票金额
+	InvoiceTime time.Time `json:"invoice_time" gorm:"column:invoice_time"` // 开票日期/到款月
+	SellerId    int       `json:"seller_id" gorm:"column:seller_id"`       // 销售ID
+	SellerName  string    `json:"seller_name" gorm:"column:seller_name"`   // 销售名称
+	NewCompany  int       `json:"new_company" gorm:"column:new_company"`   // 是否为新客户：0-否；1-是
+	CompanyName string    `json:"company_name" gorm:"column:company_name"` // 客户名称
+}
+
+func (c *ContractIncomeHistory) List(condition string, pars []interface{}) (list []*ContractIncomeHistory, err error) {
+	list = make([]*ContractIncomeHistory, 0)
+	err = global.DEFAULT_MYSQL.Model(c).
+		Where(condition, pars...).
+		Find(&list).Error
+	return
+}
+
+func (c *ContractIncomeHistory) TableName() string {
+	return "contract_income_history"
+}
+
+// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+func GetIncomeHistory(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
+	sql := `SELECT amount,seller_name,new_company,company_name,invoice_time AS invoice_date FROM contract_income_history WHERE  `
+	sql += condition
+	sql += ` ORDER BY invoice_date `
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).Find(&results).Error
+	return
+}
+
+// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+func GetIncomeHistoryList() (results []*ContractIncomeHistory, err error) {
+	sql := `SELECT * FROM contract_income_history `
+	err = global.DEFAULT_MYSQL.Raw(sql).Find(&results).Error
+	return
+}
+
+func (c *ContractIncomeHistory) Update(updateCols []string) (err error) {
+	err = global.DEFAULT_MYSQL.Model(c).Select(updateCols).Updates(c).Error
+	return
+}

models/fms/contract_invoice.go

@@ -430,7 +430,7 @@ func GetCensusSellerGroupInvoicePageList(page base.IPage, condition, outCond str
 			) AS b ON a.group_id = b.seller_group_id`
 	sql += ` WHERE %s ORDER BY %s LIMIT %d,%d`
 	sql = fmt.Sprintf(sql, tableName, amountSum, condition, outCond, page.GetOrderItemsString(), page.Offset(), page.GetPageSize())
-	err = global.DEFAULT_MYSQL.Raw(sql, pars).Scan(&results).Error
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).Scan(&results).Error
 	return
 }
 
@@ -642,9 +642,17 @@ func GetDuplicateContractInvoiceDetailItemList(companyName, startDate, endDate s
 
 type IncomeListReq struct {
 	SellerIds    string `json:"seller_ids" form:"seller_ids" description:"销售ID，多个ID之间用逗号拼接"`
-	StartDate    string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01-02" description:"开始日期"`
-	EndDate      string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01-02" description:"结束日期"`
+	StartDate    string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01" description:"开始日期"`
+	EndDate      string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01" description:"结束日期"`
 	IsExport     int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
 	ListParam    string    `json:"list_param" form:"list_param" description:"套餐类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计"`
 	CompanyType     int    `json:"company_type" form:"company_type" description:"客户类型 0全部 1新客户 2老客户"`
+}
+
+//获取最新的开票或到款日期
+func GetLatestInvoice() (result *ContractInvoice, err error) {
+	sql := `SELECT * FROM contract_invoice WHERE is_deleted = 0 ORDER BY invoice_time DESC  `
+
+	err = global.DEFAULT_MYSQL.Raw(sql).First(&result).Error
+	return
 }

models/fms/invoice_payment_summary.go

@@ -26,6 +26,7 @@ func (c *InvoicePaymentSummary) Create() (err error) {
 	err = global.DEFAULT_MYSQL.Create(c).Error
 	return
 }
+
 // DeleteAndCreate 删除并新增汇总
 func (c *InvoicePaymentSummary) DeleteAndCreate(registerId int, summaryList []*InvoicePaymentSummary) (err error) {
 	tx := global.DEFAULT_MYSQL.Begin()
@@ -49,9 +50,10 @@ func (c *InvoicePaymentSummary) DeleteAndCreate(registerId int, summaryList []*I
 }
 
 type ContractRegisterSummary struct {
-	SummaryId       int       `json:"summary_id" description:"汇总ID"`
+	SummaryId int `json:"summary_id" description:"汇总ID"`
 	ContractRegister
 }
+
 // GetInvoicePaymentCensusPageList 获取商品到款统计列表-总数
 func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []interface{}) (results []*ContractRegisterSummary, count int64, err error) {
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
@@ -179,8 +181,46 @@ func GetContractSummaryInvoicePaymentAmount(condition string, pars []interface{}
 }
 
 // GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
-func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId,invocieId int) (results []*ContractRegisterSummary, err error) {
+func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (results []*ContractRegisterSummary, err error) {
 	sql := `SELECT * FROM invoice_payment_summary WHERE register_id = ? AND invoice_id= ? `
 	err = global.DEFAULT_MYSQL.Exec(sql, registerId, invocieId).Find(&results).Error
 	return
+}
+
+type IncomeSummaryItem struct {
+	CompanyName string    `json:"company_name" description:"客户名称"`
+	NewCompany  int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
+	InvoiceDate time.Time `json:"invoice_time" description:"开票日期"`
+	Amount      float64   `json:"amount" description:"金额"`
+	SellerName  string    `json:"seller_name" description:"销售名称"`
+}
+
+// GetContractSummaryIncomeAmount 获取汇总金额合计信息
+func GetContractSummaryIncomeAmount(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
+	joinCond := ` (a.invoice_id = b.contract_invoice_id OR a.payment_id = b.contract_invoice_id) `
+
+	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
+		Select("b.amount,b.invoice_time AS invoice_date , c.new_company,c.company_name,b.seller_name").
+		Joins(fmt.Sprintf(" JOIN contract_invoice AS b ON %s AND b.is_deleted = 0 ", joinCond)).
+		Joins("JOIN contract_register AS c ON a.register_id = c.contract_register_id AND c.is_deleted = 0").
+		Where(condition, pars...).Group("id").Order("invoice_date ")
+	//nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
+	//	Select(" IFNULL( SUM( e.amount ), 0 ) ")
+
+	err = query.Find(&results).Error
+	return
+}
+
+type IncomeSummaryItemList []*IncomeSummaryItem
+
+func (c IncomeSummaryItemList) Len() int {
+	return len(c)
+}
+
+func (c IncomeSummaryItemList) Less(i, j int) bool {
+	return c[i].InvoiceDate.Before(c[j].InvoiceDate)
+}
+
+func (c IncomeSummaryItemList) Swap(i, j int) {
+	c[i], c[j] = c[j], c[i]
 }

models/statistic.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"hongze/fms_api/global"
+	"hongze/fms_api/models/fms"
 )
 
 // 收入统计图表数据
@@ -28,8 +29,10 @@ SELECT SUM(amount) contract_money  FROM contract_invoice  WHERE is_deleted = 0 A
 
 // 收入统计图表数据
 type CensusIncomeChartResp struct {
-	Title      string    `description:"图表名称"`
-	Date       []string  `description:"月份"`
-	TotalMoney []float64 `description:"总金额"`
-	Yoy        []float64 `description:"同比值"`
+	Title          string                   `description:"图表名称"`
+	Date           []string                 `description:"月份"`
+	TotalMoney     []float64                `description:"总金额"`
+	PrevTotalMoney []float64                `description:"历史总金额"`
+	Yoy            []string                 `description:"同比值"`
+	DataList       []*fms.IncomeSummaryItem ` json:"-"`
 }

routers/crm.go

@@ -20,4 +20,5 @@ func InitCrm(rg *gin.RouterGroup) {
 	slGroup.GET("list", sl.List)
 	slGroup.GET("group_list", sl.GroupList)
 	slGroup.GET("all_list", sl.AllList)
+	slGroup.GET("team_list", sl.TeamList)
 }

services/crm/company_seller.go

@@ -92,7 +92,7 @@ func GetSellerTeamGroupMap() (teamGroupMap map[int]*crm.SysGroup, err error) {
 }
 
 
-// GetSellerDepartmentList 获取销售部门列表-包含大组和小组
+// GetSellerDepartmentList 获取销售部门列表-大组
 func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 	// 获取组别列表
 	departmentIds := []int{crm.SellerDepartmentId,crm.RaiSellerDepartmentId}
@@ -270,3 +270,119 @@ func GetSellerDepartmentListWithGroupAndTeamByDepartment() (ficcList []*crm.Sell
 	}
 	return
 }
+
+// GetSellerList 获取销售部门列表-大组和小组
+func GetSellerList() (resp crm.SellerAdminWithGroupList, err error) {
+	// 获取组别列表
+	departmentIds := []int{crm.SellerDepartmentId,crm.RaiSellerDepartmentId}
+	groupCond := "department_id in (?)"
+	groupPars := make([]interface{}, 0)
+	groupPars = append(groupPars, departmentIds)
+	groupOB := new(crm.SysGroup)
+	fullGroups, e := groupOB.List(groupCond, groupPars)
+	if e != nil {
+		err = errors.New("获取组别列表失败, Err: " + e.Error())
+		return
+	}
+	fullGroupMap := make(map[int]*crm.SysGroup)
+	for _, v := range fullGroups{
+		fullGroupMap[v.GroupId] = v
+	}
+	// 获取销售部门所有销售信息
+	adminCond := "department_id in (?) "
+	adminPars := make([]interface{}, 0)
+	adminPars = append(adminPars, departmentIds)
+	adminOB := new(crm.Admin)
+	adminList, e := adminOB.List(adminCond, adminPars)
+	if e != nil {
+		err = errors.New("获取销售列表失败, Err: " + e.Error())
+		return
+	}
+
+	var listGroup []crm.SellerAdminWithGroupTree
+	//var listDepartment []crm.SellerAdminWithGroupTree
+	departmentListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	groupListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	teamListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	//departmentHasMap := make(map[int]bool)
+	groupHasMap  := make(map[int]bool)
+	teamHasMap := make(map[int]bool)
+
+	for _, v := range adminList {
+		tmp := crm.SellerAdminWithGroupTree{
+			SellerId:    v.AdminId,
+			SellerName:  v.RealName,
+		}
+		if v.GroupId > 0 {
+			if groupInfo, ok := fullGroupMap[v.GroupId]; ok {
+				if groupInfo.ParentId > 0 {
+					teamListMap[v.GroupId] = append(teamListMap[v.GroupId], tmp)
+				}else{
+					groupListMap[groupInfo.GroupId] = append(groupListMap[groupInfo.GroupId], tmp)
+				}
+			}else {
+				departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
+			}
+		}else if v.DepartmentId > 0{
+			departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
+		}
+	}
+	for _, groupInfo := range fullGroups {
+		var team1 crm.SellerAdminWithGroupTree
+		//处理小组
+		if groupInfo.ParentId > 0 {
+			if _, ok2 :=teamHasMap[groupInfo.GroupId]; !ok2 {
+				if len(teamListMap[groupInfo.GroupId]) > 0 {
+					team1 = crm.SellerAdminWithGroupTree{
+						SellerId:    groupInfo.GroupId,
+						SellerName:  groupInfo.GroupName,
+						Child: teamListMap[groupInfo.GroupId],
+					}
+					teamHasMap[groupInfo.GroupId] = true
+					groupListMap[groupInfo.ParentId] = append(groupListMap[groupInfo.ParentId], team1)
+				}
+			}
+		}
+	}
+	for _, groupInfo := range fullGroups {
+		var group1 crm.SellerAdminWithGroupTree
+		//处理大组
+		if groupInfo.ParentId == 0 {
+			if _, ok2 :=groupHasMap[groupInfo.GroupId]; !ok2 {
+				if len(groupListMap[groupInfo.GroupId]) > 0 {
+					group1 = crm.SellerAdminWithGroupTree{
+						SellerId:    groupInfo.GroupId,
+						SellerName:  groupInfo.GroupName,
+						Child: groupListMap[groupInfo.GroupId],
+					}
+					groupHasMap[groupInfo.GroupId] = true
+					departmentListMap[groupInfo.DepartmentId] = append(departmentListMap[groupInfo.DepartmentId], group1)
+					listGroup = append(listGroup, group1)
+				}
+			}
+		}
+	}
+
+
+	//分部门
+	allTitleMap := map[int]string{
+		crm.SellerDepartmentId:"FICC销售",
+		crm.RaiSellerDepartmentId:"权益销售",
+	}
+	tmp1 := crm.SellerAdminWithGroupTree{
+		SellerId:   crm.SellerDepartmentId,
+		SellerName: allTitleMap[crm.SellerDepartmentId],
+		Child:      departmentListMap[crm.SellerDepartmentId],
+	}
+	tmp2 := crm.SellerAdminWithGroupTree{
+		SellerId:   crm.RaiSellerDepartmentId,
+		SellerName: allTitleMap[crm.RaiSellerDepartmentId],
+		Child:       departmentListMap[crm.RaiSellerDepartmentId],
+	}
+	allList := make([]crm.SellerAdminWithGroupTree, 0)
+	allList = append(allList, tmp1)
+	allList = append(allList, tmp2)
+	resp.AllList = allList
+
+	return
+}