Merge branch 'fms_2.8' into debug

.gitignore

@@ -8,3 +8,4 @@ go.sum
 latest_binlog
 /rdlucklog
 /*.exe
+/fms_api

controller/census/invoice_payment.go

@@ -955,451 +955,6 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 	resp.OkData("获取成功", baseData, c)
 }
 
-// List
-// @Title 商品到款统计列表
-// @Description 商品到款统计列表
-// @Param   SellerIds		query	string		false	"销售IDs"
-// @Param   StartDate		query	string	false	"合同开始日期"
-// @Param   EndDate			query	string	false	"合同结束日期"
-// @Param   TimeType		query	int		false	"时间类型: 1-开票时间; 2-到款时间"
-// @Param   IsExport		query	int		false	"是否导出: 0-否; 1-是"
-// @Param   SortParam       query   string  false      "排序字段参数，用来排序的字段， 枚举值：'invoice_time':开票日 、 'payment_date':到款日"
-// @Param   SortType        query   string  true       "如何排序，是正序还是倒序，枚举值：`asc 正序`,`desc 倒叙`"
-// @Success 200 {object} fms.ContractRegisterItem
-// @router /census/income/list [get]
-//func (ct *InvoicePaymentController) IncomeList(c *gin.Context) {
-//	var req fms.InvoicePaymentCensusListReq
-//	if e := c.BindQuery(&req); e != nil {
-//		err, ok := e.(validator.ValidationErrors)
-//		if !ok {
-//			resp.FailData("参数解析失败", "Err:"+e.Error(), c)
-//			return
-//		}
-//		resp.FailData("参数解析失败", err.Translate(global.Trans), c)
-//		return
-//	}
-//
-//	cond := `1 = 1`
-//	pars := make([]interface{}, 0)
-//
-//	if req.SellerIds != "" {
-//		sellerIds := strings.Split(req.SellerIds, ",")
-//		cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
-//		pars = append(pars, sellerIds, sellerIds)
-//	}
-//	// 套餐筛选
-//	if req.ServiceTypes != "" {
-//		serviceTypes := strings.Split(req.ServiceTypes, ",")
-//		tempRegisterIds, e := fms.GetContractRegisterIdsByTempId(serviceTypes)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取合同登记IDs失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		if len(tempRegisterIds) > 0 {
-//			cond += ` AND a.register_id IN ?`
-//			pars = append(pars, tempRegisterIds)
-//		} else {
-//			cond += ` AND 1 = 2`
-//		}
-//	}
-//
-//	if req.ListParam == 1 {
-//		cond += ` AND a.service_product_id = 1 `
-//	} else if req.ListParam == 2 {
-//		cond += ` AND a.service_product_id = 2 `
-//	}
-//
-//	// 开票到款日期
-//	if req.TimeType != 0 {
-//		if req.TimeType == 1 && req.StartDate != "" && req.EndDate != "" {
-//			st := fmt.Sprint(req.StartDate, " 00:00:00")
-//			ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//			cond += ` AND (c.invoice_time BETWEEN ? AND ?) `
-//			pars = append(pars, st, ed)
-//		} else if req.TimeType == 2 && req.StartDate != "" && req.EndDate != "" {
-//			st := fmt.Sprint(req.StartDate, " 00:00:00")
-//			ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//			cond += ` AND (d.invoice_time BETWEEN ? AND ?) `
-//			pars = append(pars, st, ed)
-//		} else if req.TimeType == 3 && req.StartDate != "" && req.EndDate != "" {
-//			st := fmt.Sprint(req.StartDate, " 00:00:00")
-//			ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//			cond += ` AND (c.invoice_time BETWEEN ? AND ?) AND (d.invoice_time BETWEEN ? AND ?) `
-//			pars = append(pars, st, ed, st, ed)
-//		}
-//	} else if req.StartDate != "" && req.EndDate != "" {
-//		st := fmt.Sprint(req.StartDate, " 00:00:00")
-//		ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//		cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
-//		pars = append(pars, st, ed, st, ed)
-//	}
-//
-//	if req.HasInvoice == "1" {
-//		cond += ` AND a.invoice_id > 0 `
-//	} else if req.HasInvoice == "0" {
-//		cond += ` AND a.invoice_id = 0 `
-//	}
-//
-//	if req.HasPayment == "1" {
-//		cond += ` AND a.payment_id > 0 `
-//	} else if req.HasPayment == "0" {
-//		cond += ` AND a.payment_id = 0 `
-//	}
-//
-//	page := new(base.Page)
-//	page.SetPageSize(req.PageSize)
-//	page.SetCurrent(req.Current)
-//	//排序
-//	if req.SortType == "" {
-//		req.SortType = "desc"
-//	}
-//	if req.SortType != "desc" && req.SortType != "asc" {
-//		resp.Fail("排序类型不正确", c)
-//		return
-//	}
-//	if req.SortParam == "" {
-//		page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
-//		page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
-//		page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
-//		page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
-//		page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-//	} else if req.SortParam == "invoice_time" {
-//		if req.SortType == "asc" {
-//			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
-//		} else {
-//			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-//		}
-//	} else if req.SortParam == "payment_date" {
-//		if req.SortType == "asc" {
-//			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
-//		} else {
-//			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: true})
-//			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: false})
-//			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-//		}
-//	} else {
-//		resp.Fail("排序字段不正确", c)
-//		return
-//	}
-//
-//	if req.IsExport == 1 {
-//		page.SetPageSize(10000)
-//		page.SetCurrent(1)
-//	}
-//
-//	registerList, total, e := fms.GetInvoicePaymentCensusPageList(page, cond, pars)
-//	if e != nil {
-//		resp.FailMsg("获取失败", "获取商品到款统计列表总数失败, Err: "+e.Error(), c)
-//		return
-//	}
-//	queryRegisterIds := make([]int, 0)
-//	for i := range registerList {
-//		queryRegisterIds = append(queryRegisterIds, registerList[i].ContractRegisterId)
-//	}
-//
-//	//fmt.Println("queryRegisterIds:",queryRegisterIds)
-//	results := new(fms.InvoicePaymentCensusResp)
-//	if len(queryRegisterIds) > 0 {
-//		// 获取汇总数据IDs, 用于查询合计数据
-//		summaryIdsCond := cond
-//		summaryIdsPars := pars
-//		summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(summaryIdsCond, summaryIdsPars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取商品到款汇总IDs失败, Err: "+e.Error(), c)
-//			return
-//		}
-//
-//		//fmt.Println("summaryIds:",summaryIds)
-//		var listErr, totalErr, totalGroupErr error
-//		wg := sync.WaitGroup{}
-//
-//		// 响应列表
-//		respList := make([]*fms.InvoicePaymentCensusItem, 0)
-//		summaryList := make([]*fms.InvoicePaymentSummaryItem, 0)
-//		wg.Add(1)
-//		go func() {
-//			defer wg.Done()
-//
-//			// 获取汇总数据
-//			summaryCond := cond
-//			summaryCond += ` AND a.register_id IN ?`
-//			summaryPars := pars
-//			summaryPars = append(summaryPars, queryRegisterIds)
-//			summaryData, e := fms.GetInvoicePaymentCensusSummaryData(summaryCond, summaryPars)
-//			if e != nil {
-//				resp.FailMsg("获取失败", "获取商品到款汇总列表失败, Err: "+e.Error(), c)
-//				return
-//			}
-//			summaryList = summaryData
-//			//summaryIds := make([]int, 0)
-//			paymentIds := make([]int, 0)
-//			for i := range summaryList {
-//				//summaryIds = append(summaryIds, summaryList[i].SummaryId)
-//				if summaryList[i].PaymentId > 0 {
-//					paymentIds = append(paymentIds, summaryList[i].PaymentId)
-//				}
-//			}
-//
-//			// 合同套餐
-//			/*contractServiceCond := `contract_register_id IN ?`
-//			contractServicePars := make([]interface{}, 0)
-//			contractServicePars = append(contractServicePars, queryRegisterIds)
-//			contractServiceOB := new(fms.ContractService)
-//			contractServiceList, e := contractServiceOB.List(contractServiceCond, contractServicePars)
-//			if e != nil {
-//				listErr = fmt.Errorf("获取合同套餐列表失败, Err: %s", e.Error())
-//				return
-//			}
-//			contractServiceMap := make(map[int][]*fms.ContractService, 0)
-//			servicesNameMap := make(map[int][]string, 0)
-//			for i := range contractServiceList {
-//				if contractServiceMap[contractServiceList[i].ContractRegisterId] == nil {
-//					contractServiceMap[contractServiceList[i].ContractRegisterId] = make([]*fms.ContractService, 0)
-//				}
-//				contractServiceMap[contractServiceList[i].ContractRegisterId] = append(contractServiceMap[contractServiceList[i].ContractRegisterId], contractServiceList[i])
-//				servicesNameMap[contractServiceList[i].ContractRegisterId] = append(servicesNameMap[contractServiceList[i].ContractRegisterId], contractServiceList[i].Title)
-//			}
-//			*/
-//			servicesNameMap, serviceFormatMap, e := fmsService.GetContractServiceNameFormat(queryRegisterIds)
-//			if e != nil {
-//				listErr = fmt.Errorf("获取合同套餐列表失败, Err: %s", e.Error())
-//				return
-//			}
-//			// 到款套餐分配
-//			serviceAmountMap := make(map[int][]*fms.ContractPaymentServiceAmount, 0)
-//			if len(paymentIds) > 0 {
-//				serviceAmountCond := `contract_payment_id IN ?`
-//				serviceAmountPars := make([]interface{}, 0)
-//				serviceAmountPars = append(serviceAmountPars, paymentIds)
-//				serviceAmountOB := new(fms.ContractPaymentServiceAmount)
-//				serviceAmountList, e := serviceAmountOB.List(serviceAmountCond, serviceAmountPars)
-//				if e != nil {
-//					listErr = fmt.Errorf("获取到款套餐分配列表失败, Err: %s", e.Error())
-//					return
-//				}
-//				for i := range serviceAmountList {
-//					if serviceAmountMap[serviceAmountList[i].ContractPaymentId] == nil {
-//						serviceAmountMap[serviceAmountList[i].ContractPaymentId] = make([]*fms.ContractPaymentServiceAmount, 0)
-//					}
-//					serviceAmountMap[serviceAmountList[i].ContractPaymentId] = append(serviceAmountMap[serviceAmountList[i].ContractPaymentId], serviceAmountList[i])
-//				}
-//			}
-//
-//			// 重组汇总数据
-//			summaryMap := make(map[int][]*fms.InvoicePaymentCensusInfo)
-//			amountMap := make(map[string]*fms.ContractPaymentServiceAmount)
-//			for i := range summaryList {
-//				v := new(fms.InvoicePaymentCensusInfo)
-//				v.InvoiceId = summaryList[i].InvoiceId
-//				v.InvoiceDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].InvoiceDate)
-//				v.InvoiceAmount = summaryList[i].InvoiceAmount
-//				v.SellerId = summaryList[i].SellerId
-//				v.SellerName = summaryList[i].SellerName
-//				v.SellerGroupId = summaryList[i].SellerGroupId
-//				v.SellerGroupName = summaryList[i].SellerGroupName
-//				v.SellerType = summaryList[i].ServiceProductId
-//				v.PaymentId = summaryList[i].PaymentId
-//				v.PaymentDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].PaymentDate)
-//				v.PaymentAmount = summaryList[i].PaymentAmount
-//				v.PayType = summaryList[i].PayType
-//				// 套餐到款分配
-//				svaList := make([]*fms.ContractPaymentServiceAmountItem, 0)
-//				amountList := serviceAmountMap[summaryList[i].PaymentId]
-//				if amountList != nil {
-//					for i := range amountList {
-//						k := fmt.Sprintf("%d-%d", amountList[i].ContractPaymentId, amountList[i].ServiceTemplateId)
-//						amountMap[k] = amountList[i]
-//					}
-//				}
-//				// 合同对应的所有套餐
-//				svList := serviceFormatMap[summaryList[i].RegisterId]
-//				if svList != nil {
-//					for ii := range svList {
-//						vv := new(fms.ContractPaymentServiceAmountItem)
-//						vv.ServiceTemplateId = svList[ii].ServiceTemplateId
-//						vv.ServiceTemplateName = svList[ii].FormatTitle
-//						vv.ServiceTemplatePid = svList[ii].ServiceTemplatePid
-//						vv.ServiceProductId = svList[ii].ServiceProductId
-//						k2 := fmt.Sprintf("%d-%d", summaryList[i].PaymentId, svList[ii].ServiceTemplateId)
-//						a := amountMap[k2]
-//						if a != nil {
-//							vv.ContractPaymentServiceAmountId = a.ContractPaymentServiceAmountId
-//							vv.ContractPaymentId = a.ContractPaymentId
-//							vv.Amount = a.Amount
-//						}
-//						svaList = append(svaList, vv)
-//					}
-//				}
-//				v.ServiceAmountList = svaList
-//
-//				summaryMap[summaryList[i].SummaryId] = append(summaryMap[summaryList[i].SummaryId], v)
-//			}
-//
-//			// 响应列表
-//			for i := range registerList {
-//				v := new(fms.InvoicePaymentCensusItem)
-//				v.SummaryId = registerList[i].SummaryId
-//				v.ContractRegisterId = registerList[i].ContractRegisterId
-//				v.CompanyName = registerList[i].CompanyName
-//				v.NewCompany = registerList[i].NewCompany
-//				v.StartDate = utils.TimeTransferString(utils.FormatDate, registerList[i].StartDate)
-//				v.EndDate = utils.TimeTransferString(utils.FormatDate, registerList[i].EndDate)
-//				v.ServicesName = servicesNameMap[registerList[i].ContractRegisterId]
-//				v.InvoicePaymentList = summaryMap[registerList[i].SummaryId]
-//				v.ContractType = registerList[i].ContractType
-//				respList = append(respList, v)
-//			}
-//		}()
-//
-//		// 开票到款金额合计(换算后)
-//		var invoiceTotal, paymentTotal, amountTotal float64
-//		wg.Add(1)
-//		go func() {
-//			defer wg.Done()
-//
-//			if len(summaryIds) == 0 {
-//				return
-//			}
-//			amountTotalCond := `a.id IN ?`
-//			amountTotalPars := make([]interface{}, 0)
-//			amountTotalPars = append(amountTotalPars, summaryIds)
-//			invoiceSum, e := fms.GetContractSummaryInvoicePaymentAmountTotal(amountTotalCond, amountTotalPars, 1)
-//			if e != nil {
-//				totalErr = fmt.Errorf("获取汇总开票金额合计失败, Err: %s", e.Error())
-//				return
-//			}
-//			invoiceTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", invoiceSum), 64)
-//			paymentSum, e := fms.GetContractSummaryInvoicePaymentAmountTotal(amountTotalCond, amountTotalPars, 2)
-//			if e != nil {
-//				totalErr = fmt.Errorf("获取汇总到款金额合计失败, Err: %s", e.Error())
-//				return
-//			}
-//			paymentTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSum), 64)
-//
-//			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(amountTotalPars, summaryIds)
-//			amountSum, e := fms.GetContractSummaryInvoicePaymentAmount(amountCond, amountPars)
-//			if e != nil {
-//				totalErr = fmt.Errorf("获取汇总金额合计失败, Err: %s", e.Error())
-//				return
-//			}
-//			amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
-//		}()
-//
-//		// 分币种金额统计
-//		invoiceCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		paymentCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		wg.Add(1)
-//		go func() {
-//			defer wg.Done()
-//
-//			currencyOB := new(fms.CurrencyUnit)
-//			currencyCond := `enable = 1`
-//			currencyPars := make([]interface{}, 0)
-//			currencyList, e := currencyOB.List(currencyCond, currencyPars)
-//			if e != nil {
-//				totalGroupErr = fmt.Errorf("获取货币列表失败, Err: %s", e.Error())
-//				return
-//			}
-//			unitMap := make(map[string]string)
-//			for i := range currencyList {
-//				unitMap[currencyList[i].Code] = currencyList[i].UnitName
-//				invoiceCurrencyTotals = append(invoiceCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//					Name:     currencyList[i].Name,
-//					UnitName: currencyList[i].UnitName,
-//					Code:     currencyList[i].Code,
-//					FlagImg:  currencyList[i].FlagImg,
-//				})
-//				paymentCurrencyTotals = append(paymentCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//					Name:     currencyList[i].Name,
-//					UnitName: currencyList[i].UnitName,
-//					Code:     currencyList[i].Code,
-//					FlagImg:  currencyList[i].FlagImg,
-//				})
-//			}
-//
-//			if len(summaryIds) == 0 {
-//				return
-//			}
-//			totalGroupCond := `a.id IN ?`
-//			totalGroupPars := make([]interface{}, 0)
-//			totalGroupPars = append(totalGroupPars, summaryIds)
-//			invoiceSumGroup, e := fms.GetSummaryListCurrencySum(totalGroupCond, totalGroupPars, 1)
-//			if e != nil {
-//				totalGroupErr = fmt.Errorf("获取汇总货币合计开票金额失败, Err: %s", e.Error())
-//				return
-//			}
-//			paymentSumGroup, e := fms.GetSummaryListCurrencySum(totalGroupCond, totalGroupPars, 2)
-//			if e != nil {
-//				totalGroupErr = fmt.Errorf("获取汇总货币合计到款金额失败, Err: %s", e.Error())
-//				return
-//			}
-//			invoiceSumMap := make(map[string]float64)
-//			paymentSumMap := make(map[string]float64)
-//			for i := range invoiceSumGroup {
-//				invoiceSumMap[invoiceSumGroup[i].CurrencyUnit] = invoiceSumGroup[i].OriginAmountTotal
-//				continue
-//			}
-//			for i := range paymentSumGroup {
-//				paymentSumMap[paymentSumGroup[i].CurrencyUnit] = paymentSumGroup[i].OriginAmountTotal
-//				continue
-//			}
-//			for i := range invoiceCurrencyTotals {
-//				a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", invoiceSumMap[invoiceCurrencyTotals[i].Code]), 64)
-//				invoiceCurrencyTotals[i].Amount = a
-//			}
-//			for i := range paymentCurrencyTotals {
-//				a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSumMap[paymentCurrencyTotals[i].Code]), 64)
-//				paymentCurrencyTotals[i].Amount = a
-//			}
-//		}()
-//
-//		wg.Wait()
-//
-//		if listErr != nil {
-//			resp.FailMsg("获取失败", listErr.Error(), c)
-//			return
-//		}
-//		if totalErr != nil {
-//			resp.FailMsg("获取失败", totalErr.Error(), c)
-//			return
-//		}
-//		if totalGroupErr != nil {
-//			resp.FailMsg("获取失败", totalGroupErr.Error(), c)
-//			return
-//		}
-//
-//		results.DataList = respList
-//		results.InvoiceTotal = invoiceTotal
-//		results.PaymentTotal = paymentTotal
-//		results.AmountTotal = amountTotal
-//		results.InvoiceCurrencyTotal = invoiceCurrencyTotals
-//		results.PaymentCurrencyTotal = paymentCurrencyTotals
-//	}
-//
-//	// 是否导出
-//	if req.IsExport == 1 {
-//		ExportInvoicePaymentCensusList(c, results)
-//		return
-//	}
-//	page.SetTotal(total)
-//	baseData := new(base.BaseData)
-//	baseData.SetPage(page)
-//	baseData.SetList(results)
-//	resp.OkData("获取成功", baseData, c)
-//}
-
 // IncomeList
 // @Title 业务收入统计表
 // @Description 获取业务收入统计表接口
@@ -1450,7 +1005,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 	//if redisErr != nil {
 
 	//获取最新的开票到款日期
-	invoiceItem,err := fms.GetLatestInvoice()
+	invoiceItem,err := fms.GetLatestIncome()
 	if err != nil {
 		err = fmt.Errorf("获取最新的开票或到款日期, Err: %s", err.Error())
 		return
@@ -1461,7 +1016,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 	var yoySlice []string
 	var yearNum, monthNum int
 	var reqStartDate, reqEndDate time.Time
-	historyTime, _ := time.Parse(utils.FormatDate, "2023-03-01")
+	historyTime, _ := time.Parse(utils.FormatDate, "2023-04-01")
 
 	if req.StartDate != "" && req.EndDate != "" {
 		st := fmt.Sprint(req.StartDate, "-01 00:00:00")
@@ -1473,7 +1028,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			monthNum = int(invoiceItem.InvoiceDate.Month() - 1)
 		} else {
 			yearNum = reqEndDate.Year() - reqStartDate.Year()
-			monthNum = int(reqEndDate.Month() - 1)
+			monthNum = int(reqEndDate.Month() - reqStartDate.Month())
 		}
 	} else {
 		yearNum = invoiceItem.InvoiceDate.Year() - 2020
@@ -1492,6 +1047,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 	var accumulate float64
 	var historyAccumulate float64
 	fmt.Println("numMonth:",numMonth)
+	fmt.Println("InvoiceDate:",invoiceItem.InvoiceDate)
 
 	for i := 0; i <= numMonth; i++ {
 		//timeNow, _ := time.Parse("2006-01", time.Now().Format("2006-01"))
@@ -1517,6 +1073,10 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		if req.StartDate != "" && req.EndDate != "" {
 			endDateTime = reqStartDate.AddDate(0, i+1, -1)
 			prevEndDateTime = reqStartDate.AddDate(-1, i+1, -1)
+			if reqEndDate.After(invoiceItem.InvoiceDate) {
+				endDateTime = invoiceItem.InvoiceDate.AddDate(0, i, 0)
+				prevEndDateTime = invoiceItem.InvoiceDate.AddDate(-1, i, 0)
+			}
 		} else {
 			endDateTime = invoiceItem.InvoiceDate.AddDate(0, i-numMonth+1, -1)
 			prevEndDateTime = invoiceItem.InvoiceDate.AddDate(-1, i-numMonth+1, -1)

models/fms/contract_invoice.go

@@ -656,8 +656,8 @@ type IncomeListReq struct {
 }
 
 //获取最新的开票或到款日期
-func GetLatestInvoice() (result *ContractInvoice, err error) {
+func GetLatestIncome() (result *ContractInvoice, err error) {
-	sql := `SELECT * FROM contract_invoice WHERE is_deleted = 0 ORDER BY invoice_time DESC  `
+	sql := `SELECT * FROM contract_invoice WHERE is_deleted = 0  ORDER BY invoice_time DESC  `
 
 	err = global.DEFAULT_MYSQL.Raw(sql).First(&result).Error
 	return