Compare commits
2 Commits
f00c818f63
...
0f52c6d265
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f52c6d265 | ||
|
|
acfe5f9d3c |
@ -251,6 +251,15 @@ func GetImportData(c *gin.Context) {
|
||||
service.Error(c, errors.New("请检查excel文件"))
|
||||
return
|
||||
}
|
||||
//去重操作
|
||||
set := make(map[string]struct{})
|
||||
var uniqueExcelData []excelData
|
||||
for _, data := range readExcelResult {
|
||||
if _, exists := set[data.SubName]; !exists {
|
||||
set[data.SubName] = struct{}{}
|
||||
uniqueExcelData = append(uniqueExcelData, data)
|
||||
}
|
||||
}
|
||||
res, err := service.AccountFieeProvider.UserList(context.Background(), &account.UserListRequest{
|
||||
Domain: "app",
|
||||
})
|
||||
@ -258,35 +267,33 @@ func GetImportData(c *gin.Context) {
|
||||
service.Error(c, errors.New("用户查询失败"))
|
||||
return
|
||||
}
|
||||
//检查subname是否正确是否存在
|
||||
subNames := make(map[string]struct{}, len(res.UserList))
|
||||
for _, v := range res.UserList {
|
||||
subNames[v.SubNum] = struct{}{}
|
||||
}
|
||||
fmt.Println(subNames)
|
||||
//检查subname是否正确是否存在
|
||||
for _, v := range readExcelResult {
|
||||
for _, v := range uniqueExcelData {
|
||||
if _, ok := subNames[v.SubName]; !ok {
|
||||
service.Error(c, errors.New(fmt.Sprintf("第 %d 行数据错误,请检查数据!", v.Line)))
|
||||
return
|
||||
}
|
||||
}
|
||||
//检查subname和name是否匹配
|
||||
subNameFindExcelData := make(map[string]excelData, len(readExcelResult))
|
||||
for _, v := range readExcelResult {
|
||||
subNameFindExcelData := make(map[string]excelData, len(uniqueExcelData))
|
||||
for _, v := range uniqueExcelData {
|
||||
subNameFindExcelData[v.SubName] = v
|
||||
}
|
||||
subNameFindID := make(map[string]uint64, len(readExcelResult))
|
||||
result := make([]excelDataResult, 0, len(readExcelResult))
|
||||
subNameFindID := make(map[string]uint64, len(uniqueExcelData))
|
||||
result := make([]excelDataResult, 0, len(uniqueExcelData))
|
||||
for _, v := range res.UserList {
|
||||
subNameFindID[v.SubNum] = v.Id
|
||||
|
||||
if subNameFindExcelData[v.SubNum].Name != v.Name && subNameFindExcelData[v.SubNum].Name != "" {
|
||||
fmt.Println(subNameFindExcelData[v.SubNum], v.Name)
|
||||
service.Error(c, errors.New(fmt.Sprintf("第 %d 行数据错误,请检查数据!", subNameFindExcelData[v.SubNum].Line)))
|
||||
return
|
||||
}
|
||||
}
|
||||
for _, v := range readExcelResult {
|
||||
for _, v := range uniqueExcelData {
|
||||
result = append(result, excelDataResult{
|
||||
Id: subNameFindID[v.SubName],
|
||||
Name: v.Name,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user