新老客户字段替换，bugfix

controller/census/invoice_payment.go

@@ -431,7 +431,11 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		// 是否新客户
 		colC := dataRow.AddCell()
 		colC.VMerge = mergeRowNum
-		colC.SetString(newCompanyMap[v.NewCompany])
+		newCompany := 0
+		if v.ContractType == 1 {
+			newCompany = 1
+		}
+		colC.SetString(newCompanyMap[newCompany])
 		// 合同有效期
 		colD := dataRow.AddCell()
 		colD.VMerge = mergeRowNum
@@ -1567,7 +1571,11 @@ func ExportIncomeList(c *gin.Context, list []*fms.IncomeSummaryItem) {
 	for _, v := range incomeSummaryItemList {
 		dataRow := sheet.AddRow()
 		dataRow.AddCell().SetString(v.InvoiceDate.Format(utils.FormatDate)) // 开票日期
-		dataRow.AddCell().SetString(strconv.Itoa(v.NewCompany))             // 新客户
+		newCompany := 0
+		if v.ContractType == 1 {
+			newCompany = 1
+		}
+		dataRow.AddCell().SetString(strconv.Itoa(newCompany))             // 新客户
 		dataRow.AddCell().SetString(v.CompanyName)                          // 客户名称
 		dataRow.AddCell().SetString(fmt.Sprint(v.Amount))                   // 金额
 		dataRow.AddCell().SetString(v.SellerName)                           // 销售员

controller/contract/register.go

@@ -2122,7 +2122,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		row2NameKeyMap[row3Title[i]] = i
 	}
 
-	newCompanyMap := map[int]string{0: "1", 1: "0"}
+	newCompanyMap := map[int]string{2: "1", 1: "0"}
 	contractTMap := map[int]int{
 		fms.ContractTypeSelf:   0,
 		fms.ContractTypebehalf: 1,
@@ -2137,7 +2137,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow := sheet.AddRow()
 		dataRow.SetHeight(20)
 		dataRow.AddCell().SetString(v.CompanyName)
-		dataRow.AddCell().SetString(newCompanyMap[v.NewCompany])
+		dataRow.AddCell().SetString(newCompanyMap[v.ContractType])
 		dataRow.AddCell().SetString(fmt.Sprint(contractTMap[v.HasPayment]))
 		dataRow.AddCell().SetString(fmt.Sprint(contractSubTMap[v.ContractType]))
 		if v.HasPayment == 1 {

models/fms/contract_income_history.go

@@ -29,7 +29,7 @@ func (c *ContractIncomeHistory) TableName() string {
 
 // 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 := `SELECT amount,seller_name,new_company AS contract_type,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

models/fms/invoice_payment_summary.go

@@ -189,7 +189,7 @@ func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int)
 
 type IncomeSummaryItem struct {
 	CompanyName string    `json:"company_name" description:"客户名称"`
-	NewCompany  int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
+	ContractType  int       `json:"contract_type" description:"是否为新客户: 2-否; 1-是"`
 	InvoiceDate time.Time `json:"invoice_time" description:"开票日期"`
 	Amount      float64   `json:"amount" description:"金额"`
 	SellerName  string    `json:"seller_name" description:"销售名称"`
@@ -200,7 +200,7 @@ func GetContractSummaryIncomeAmount(condition string, pars []interface{}) (resul
 	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").
+		Select("b.amount,b.invoice_time AS invoice_date , c.contract_type,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 ")