|
@@ -6050,6 +6050,18 @@ func initPointBill() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ listCompany, err := company.GetOverseasCompanysByCompanyIds(companyIds)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println(err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ mapCompamyName := make(map[int]string)
|
|
|
+
|
|
|
+ for _, v := range listCompany {
|
|
|
+ mapCompamyName[v.CompanyId] = v.CompanyName
|
|
|
+ }
|
|
|
+
|
|
|
//创建excel
|
|
|
dir, err := os.Executable()
|
|
|
exPath := filepath.Dir(dir)
|
|
@@ -6113,7 +6125,7 @@ func initPointBill() {
|
|
|
}
|
|
|
row := sheet.AddRow()
|
|
|
cellADatatitle := row.AddCell()
|
|
|
- cellADatatitle.Value = v.CompanyName
|
|
|
+ cellADatatitle.Value = mapCompamyName[v.CompanyId]
|
|
|
|
|
|
cellADataPd := row.AddCell()
|
|
|
|