Merge branch 'fms_2.8'

controller/census/invoice_payment.go

@@ -412,7 +412,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		}
 	}
 
-	newCompanyMap := map[int]string{0: "否", 1: "是"}
+	newCompanyMap := map[int]string{0: "/", 1: "是" , 2: "否"}
 	sellerTypeMap := map[int]string{1: "FICC销售", 2: "权益销售"}
 	for k, v := range list {
 		dataRow := sheet.AddRow()
@@ -431,11 +431,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		// 是否新客户
 		colC := dataRow.AddCell()
 		colC.VMerge = mergeRowNum
-		newCompany := 0
-		if v.ContractType == 1 {
-			newCompany = 1
-		}
-		colC.SetString(newCompanyMap[newCompany])
+		colC.SetString(newCompanyMap[v.ContractType])
 		// 合同有效期
 		colD := dataRow.AddCell()
 		colD.VMerge = mergeRowNum

controller/contract/pre_register.go

@@ -190,6 +190,7 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 	ob.HasInvoice = 1
 	ob.Set()
 	ob.CurrencyUnit = currencyUnit
+	ob.ContractType = 2
 	if req.RegisterType == fms.ContractInvoiceTypePreMake {
 		//sellerItem := sellerMap[r.SellerId]
 		//if sellerItem == nil {