no message

controllers/statistic_company_merge.go

@@ -264,7 +264,6 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			condition1 += ` AND a.seller_id_init in  (` + adminId + `) `
 		}
 
-		fmt.Println(condition1)
 		newCompanyTotal, err = company.GetIncrementalNewCompanyProductMergeCount(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
@@ -576,17 +575,23 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
 	cellName.SetStyle(style)
 	cellName.SetValue("客户名称")
 
-	cellProName := titleRow.AddCell()
-	cellProName.SetStyle(style)
-	cellProName.SetValue("客户类型")
+	//cellProName := titleRow.AddCell()
+	//cellProName.SetStyle(style)
+	//cellProName.SetValue("客户类型")
 
 	cellSellerName := titleRow.AddCell()
 	cellSellerName.SetStyle(style)
 	cellSellerName.SetValue("所属销售")
 
-	cellMoney := titleRow.AddCell()
-	cellMoney.SetStyle(style)
-	cellMoney.SetValue("合同金额")
+	if dataType != "新增试用" {
+		cellShareSeller := titleRow.AddCell()
+		cellShareSeller.SetStyle(style)
+		cellShareSeller.SetValue("服务销售")
+
+		cellMoney := titleRow.AddCell()
+		cellMoney.SetStyle(style)
+		cellMoney.SetValue("合同金额")
+	}
 
 	cellTime := titleRow.AddCell()
 	cellTime.SetStyle(style)
@@ -608,9 +613,13 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
 		cellContent.SetStyle(style)
 		cellContent.SetValue("详细原因")
 	}
-	cellPermissionName := titleRow.AddCell()
-	cellPermissionName.SetStyle(style)
-	cellPermissionName.SetValue("签约套餐")
+
+	if dataType != "新增试用" {
+		cellPermissionName := titleRow.AddCell()
+		cellPermissionName.SetStyle(style)
+		cellPermissionName.SetValue("签约套餐")
+	}
+
 	for _, v := range resp.List {
 		dataRow := sheel.AddRow()
 		dataRow.SetHeight(20)
@@ -619,18 +628,26 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
 		cellDataName.SetStyle(style)
 		cellDataName.SetValue(v.CompanyName)
 
-		cellDataProName := dataRow.AddCell()
-		cellDataProName.SetStyle(style)
-		cellDataProName.SetValue(v.ProductName)
+		//cellDataProName := dataRow.AddCell()
+		//cellDataProName.SetStyle(style)
+		//cellDataProName.SetValue(v.ProductName)
 
 		cellDataSellerName := dataRow.AddCell()
 		cellDataSellerName.SetStyle(style)
 		cellDataSellerName.SetValue(v.SellerName)
 
+		if dataType != "新增试用" {
+			cellDataShareSeller := dataRow.AddCell()
+			cellDataShareSeller.SetStyle(style)
+			cellDataShareSeller.SetValue(v.ShareSeller)
+
+			cellDataMoney := dataRow.AddCell()
+			cellDataMoney.SetStyle(style)
+			cellDataMoney.SetValue(v.Money)
+		}
+
 		//if dataType == "新签客户" || dataType == "续约客户" {
-		cellDataMoney := dataRow.AddCell()
-		cellDataMoney.SetStyle(style)
-		cellDataMoney.SetValue(v.Money)
+
 		//}
 
 		cellDataTime := dataRow.AddCell()
@@ -639,11 +656,11 @@ func MergeCompanyListListExport(this *StatisticCompanyMergerController, dataType
 		case "新增试用":
 			cellDataTime.SetValue(v.CreateTime)
 		case "新签客户":
-			cellDataTime.SetValue(v.StartDate)
+			cellDataTime.SetValue(fmt.Sprint(v.StartDate, " ~  ", v.EndDate))
 		case "续约客户":
-			cellDataTime.SetValue(v.StartDate)
+			cellDataTime.SetValue(fmt.Sprint(v.StartDate, " ~  ", v.EndDate))
 		case "未续约客户":
-			cellDataTime.SetValue(v.EndDate)
+			cellDataTime.SetValue(fmt.Sprint(v.StartDate, " ~  ", v.EndDate))
 
 			cellAscribeContent := dataRow.AddCell()
 			cellAscribeContent.SetStyle(style)

controllers/statistic_report.go

@@ -2424,13 +2424,22 @@ func StackCompanyListExportRai(this *StatisticReportController, dataType string,
 		cellContent.SetStyle(style)
 		cellContent.SetValue("详细原因")
 	default:
+
+		cellShareSeller := titleRow.AddCell()
+		cellShareSeller.SetStyle(style)
+		cellShareSeller.SetValue("服务销售")
+
 		cellTime := titleRow.AddCell()
 		cellTime.SetStyle(style)
-		cellTime.SetValue("服务期限")
+		cellTime.SetValue("合同期限")
 
-		cellDay := titleRow.AddCell()
-		cellDay.SetStyle(style)
-		cellDay.SetValue("剩余天数")
+		cellMoney := titleRow.AddCell()
+		cellMoney.SetStyle(style)
+		cellMoney.SetValue("合同金额")
+
+		cellPermissionName := titleRow.AddCell()
+		cellPermissionName.SetStyle(style)
+		cellPermissionName.SetValue("签约套餐")
 	}
 
 	for _, v := range resp.List {
@@ -2449,6 +2458,12 @@ func StackCompanyListExportRai(this *StatisticReportController, dataType string,
 		cellDataSellerName.SetStyle(style)
 		cellDataSellerName.SetValue(v.SellerName)
 
+		if dataType != "未续约客户" {
+			cellDataShareSeller := dataRow.AddCell()
+			cellDataShareSeller.SetStyle(style)
+			cellDataShareSeller.SetValue(v.ShareSeller)
+		}
+
 		cellDataTime := dataRow.AddCell()
 		cellDataTime.SetStyle(style)
 		switch dataType {
@@ -2463,11 +2478,19 @@ func StackCompanyListExportRai(this *StatisticReportController, dataType string,
 			cellDataRemark := dataRow.AddCell()
 			cellDataRemark.SetStyle(style)
 			cellDataRemark.SetValue(v.RenewalReason)
+
+			cellDay := dataRow.AddCell()
+			cellDay.SetStyle(style)
+			cellDay.SetValue(v.ExpireDay)
 		}
 
-		cellDay := dataRow.AddCell()
-		cellDay.SetStyle(style)
-		cellDay.SetValue(v.ExpireDay)
+		cellMoney := dataRow.AddCell()
+		cellMoney.SetStyle(style)
+		cellMoney.SetValue(v.Money)
+
+		cellPermissionName := dataRow.AddCell()
+		cellPermissionName.SetStyle(style)
+		cellPermissionName.SetValue(v.PermissionName)
 
 		switch dataType {
 		case "未续约客户":