|
|
@@ -1,7 +1,6 @@
|
|
|
package oilsupplier
|
|
|
|
|
|
import (
|
|
|
- "dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
|
|
|
"dashoo.cn/backend/api/business/oilsupplier/supplierdataentry"
|
|
|
"dashoo.cn/backend/api/business/workflow"
|
|
|
. "dashoo.cn/backend/api/controllers"
|
|
|
@@ -59,7 +58,7 @@ func (this *SupplierDataEntryController) DocExport() {
|
|
|
var tabledata4 []supplierdataentry.SupplierThreeYearsDataEntryView
|
|
|
var tabledata5 []supplierdataentry.SupplierPatentDataEntryView
|
|
|
var tabledata6 []supplierdataentry.SupplierWinningDataEntryView
|
|
|
- var tabledata7 []suppliercertsub.OilSupplierCertSub
|
|
|
+ var tabledata7 []supplierdataentry.SupplierCertSubEntry
|
|
|
|
|
|
SupplierCertId := strconv.Itoa(model2.Id)
|
|
|
where3 := "SupplierCertId = '" + SupplierCertId + "'"
|
|
|
@@ -141,12 +140,16 @@ func (this *SupplierDataEntryController) DocExport() {
|
|
|
datamap["DesignerTotal"] = model2.DesignerTotal
|
|
|
datamap["SkillerTotal"] = model2.SkillerTotal
|
|
|
|
|
|
- var Name string
|
|
|
- Name = tabledata7[0].Name
|
|
|
- for i := 1; i < len(tabledata7); i++ {
|
|
|
- Name = Name + "," + tabledata7[i].Name
|
|
|
+ if len(tabledata7) != 0 {
|
|
|
+ var Name string
|
|
|
+ Name = tabledata7[0].Name
|
|
|
+ for i := 1; i < len(tabledata7); i++ {
|
|
|
+ Name = Name + "," + tabledata7[i].Name
|
|
|
+ }
|
|
|
+ datamap["Name"] = Name
|
|
|
+ } else {
|
|
|
+ datamap["Name"] = ""
|
|
|
}
|
|
|
- datamap["Name"] = Name
|
|
|
|
|
|
var interfaceSlice3 = make([]interface{}, len(tabledata3))
|
|
|
datamap["MajorEquipments"] = workflow.TableDetailData{
|