新增删除白名单样式修改

services/user.go

@@ -670,29 +670,33 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	cellA := rowTitle.AddCell()
 	cellA.Value = "姓名"
 	cellB := rowTitle.AddCell()
-	cellB.Value = "手机号"
+	cellB.Value = "国际代码1"
 	cellC := rowTitle.AddCell()
-	cellC.Value = "国际代码"
+	cellC.Value = "手机号"
 	cellD := rowTitle.AddCell()
-	cellD.Value = "公司"
+	cellD.Value = "国际代码2"
 	cellE := rowTitle.AddCell()
-	cellE.Value = "职位"
+	cellE.Value = "备用号"
 	cellF := rowTitle.AddCell()
-	cellF.Value = "邮箱"
+	cellF.Value = "电子邮箱"
 	cellG := rowTitle.AddCell()
-	cellG.Value = "客户类型"
+	cellG.Value = "公司名称"
 	cellH := rowTitle.AddCell()
-	cellH.Value = "对口销售"
+	cellH.Value = "职位名称"
 	cellI := rowTitle.AddCell()
-	cellI.Value = "有效开始时间"
+	cellI.Value = "客户类型"
 	cellJ := rowTitle.AddCell()
-	cellJ.Value = "有效结束时间"
+	cellJ.Value = "对口销售"
 	cellK := rowTitle.AddCell()
 	cellK.Value = "归属部门"
 	cellL := rowTitle.AddCell()
-	cellL.Value = "备注"
+	cellL.Value = "有效开始时间"
 	cellM := rowTitle.AddCell()
-	cellM.Value = "权限（消费，医药，智造，科技，策略）"
+	cellM.Value = "有效结束时间"
+	cellN := rowTitle.AddCell()
+	cellN.Value = "备注"
+	cellO := rowTitle.AddCell()
+	cellO.Value = "权限（消费，医药，智造，科技，策略）"
 
 	if len(rep.List) > 0 {
 		for _, item := range rep.List {
@@ -700,35 +704,39 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 			cellA := row.AddCell()
 			cellA.Value = item.RealName
 			cellB := row.AddCell()
-			cellB.Value = item.Mobile
-			cellC := row.AddCell()
-			cellC.Value = item.CountryCode
+			cellB.Value = item.CountryCode
 			if len(item.Mobile) >= 11 && item.CountryCode == "" {
-				cellC.Value = "86"
+				cellB.Value = "86"
 			}
+			cellC := row.AddCell()
+			cellC.Value = item.Mobile
 			cellD := row.AddCell()
-			cellD.Value = item.CompanyName
+			cellD.Value = ""
 			cellE := row.AddCell()
 			cellE.Value = ""
 			cellF := row.AddCell()
 			cellF.Value = ""
 			cellG := row.AddCell()
-			cellG.Value = ""
+			cellG.Value = item.CompanyName
 			cellH := row.AddCell()
-			cellH.Value = item.SellerName
+			cellH.Value = ""
 			cellI := row.AddCell()
 			cellI.Value = ""
 			cellJ := row.AddCell()
-			cellJ.Value = ""
+			cellJ.Value = item.SellerName
 			cellK := row.AddCell()
 			cellK.Value = ""
 			cellL := row.AddCell()
 			cellL.Value = ""
 			cellM := row.AddCell()
+			cellM.Value = ""
+			cellN := row.AddCell()
+			cellN.Value = ""
+			cellO := row.AddCell()
 			if item.Permission == "" {
 				item.Permission = "专家/医药/智造/消费/研选/科技/策略/路演服务"
 			}
-			cellM.Value = item.Permission
+			cellO.Value = item.Permission
 		}
 	}
 	errFile = xlsxFile.Save(downLoadnFilePath)
@@ -773,29 +781,33 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	cellA = rowTitle.AddCell()
 	cellA.Value = "姓名"
 	cellB = rowTitle.AddCell()
-	cellB.Value = "手机号"
+	cellB.Value = "国际代码1"
 	cellC = rowTitle.AddCell()
-	cellC.Value = "国际代码"
+	cellC.Value = "手机号"
 	cellD = rowTitle.AddCell()
-	cellD.Value = "公司"
+	cellD.Value = "国际代码2"
 	cellE = rowTitle.AddCell()
-	cellE.Value = "职位"
+	cellE.Value = "备用号"
 	cellF = rowTitle.AddCell()
-	cellF.Value = "邮箱"
+	cellF.Value = "电子邮箱"
 	cellG = rowTitle.AddCell()
-	cellG.Value = "客户类型"
+	cellG.Value = "公司名称"
 	cellH = rowTitle.AddCell()
-	cellH.Value = "对口销售"
+	cellH.Value = "职位名称"
 	cellI = rowTitle.AddCell()
-	cellI.Value = "有效开始时间"
+	cellI.Value = "客户类型"
 	cellJ = rowTitle.AddCell()
-	cellJ.Value = "有效结束时间"
+	cellJ.Value = "对口销售"
 	cellK = rowTitle.AddCell()
 	cellK.Value = "归属部门"
 	cellL = rowTitle.AddCell()
-	cellL.Value = "备注"
+	cellL.Value = "有效开始时间"
 	cellM = rowTitle.AddCell()
-	cellM.Value = "权限（消费，医药，智造，科技，策略）"
+	cellM.Value = "有效结束时间"
+	cellN = rowTitle.AddCell()
+	cellN.Value = "备注"
+	cellO = rowTitle.AddCell()
+	cellO.Value = "权限（消费，医药，智造，科技，策略）"
 	//手机号冻结
 	listFrozen, err := models.GetFrozenUserWhiteList()                 //手机号用户修改
 	listFrozenOutbound, err := models.GetFrozenUserWhiteListOutbound() //外呼手机号用户修改
@@ -814,37 +826,36 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 			cellA := row.AddCell()
 			cellA.Value = item.RealName
 			cellB := row.AddCell()
-			if item.Mobile != "" {
-				cellB.Value = item.Mobile
-			} else {
-				cellB.Value = item.OutboundMobile
+			cellB.Value = item.CountryCode
+			if len(item.Mobile) >= 11 && item.CountryCode == "" {
+				cellB.Value = "86"
 			}
 			cellC := row.AddCell()
-			if item.CountryCode != "" {
-				cellC.Value = item.CountryCode
-			} else {
-				cellC.Value = item.OutboundCountryCode
-			}
+			cellC.Value = item.Mobile
 			cellD := row.AddCell()
-			cellD.Value = item.CompanyName
+			cellD.Value = ""
 			cellE := row.AddCell()
 			cellE.Value = ""
 			cellF := row.AddCell()
 			cellF.Value = ""
 			cellG := row.AddCell()
-			cellG.Value = ""
+			cellG.Value = item.CompanyName
 			cellH := row.AddCell()
-			cellH.Value = item.SellerName
+			cellH.Value = ""
 			cellI := row.AddCell()
 			cellI.Value = ""
 			cellJ := row.AddCell()
-			cellJ.Value = ""
+			cellJ.Value = item.SellerName
 			cellK := row.AddCell()
 			cellK.Value = ""
 			cellL := row.AddCell()
 			cellL.Value = ""
 			cellM := row.AddCell()
-			cellM.Value = item.PermissionName
+			cellM.Value = ""
+			cellN := row.AddCell()
+			cellN.Value = ""
+			cellO := row.AddCell()
+			cellO.Value = item.PermissionName
 		}
 	}
 	errFile = xlsxFile.Save(downLoadnFilePaths)