准入范围字段及表格修改

src/dashoo.cn/backend/api/controllers/oilsupplier/supplierdataentry.go

@@ -1,6 +1,7 @@
 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"
@@ -58,13 +59,15 @@ func (this *SupplierDataEntryController) DocExport() {
 	var tabledata4 []supplierdataentry.SupplierThreeYearsDataEntryView
 	var tabledata5 []supplierdataentry.SupplierPatentDataEntryView
 	var tabledata6 []supplierdataentry.SupplierWinningDataEntryView
+	var tabledata7 []suppliercertsub.OilSupplierCertSub
 
 	SupplierCertId := strconv.Itoa(model2.Id)
 	where3 := "SupplierCertId = '" + SupplierCertId + "'"
-	/*has3 :=*/ svc.GetEntitysByOrderbyWhere(OilEnterpriseMajorEquipmentName, where3, "1", &tabledata3)
-	/*has4 :=*/ svc.GetEntitysByOrderbyWhere(OilThreeYearsPerformanceName, where3, "1", &tabledata4)
-	/*has5 :=*/ svc.GetEntitysByOrderbyWhere(OilPatentStatisticalName, where3, "1", &tabledata5)
-	/*has6 :=*/ svc.GetEntitysByOrderbyWhere(OilWinningProjectName, where3, "1", &tabledata6)
+	svc.GetEntitysByOrderbyWhere(OilEnterpriseMajorEquipmentName, where3, "1", &tabledata3)
+	svc.GetEntitysByOrderbyWhere(OilThreeYearsPerformanceName, where3, "1", &tabledata4)
+	svc.GetEntitysByOrderbyWhere(OilPatentStatisticalName, where3, "1", &tabledata5)
+	svc.GetEntitysByOrderbyWhere(OilWinningProjectName, where3, "1", &tabledata6)
+	svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, where3, "1", &tabledata7)
 
 	//wheretable := "MId=" + strconv.Itoa(model.Id)
 	//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
@@ -138,12 +141,19 @@ 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
+	}
+	datamap["Name"] = Name
+
 	var interfaceSlice3 = make([]interface{}, len(tabledata3))
 	datamap["MajorEquipments"] = workflow.TableDetailData{
 		DataList:   interfaceSlice3,
 		StartRow:   2,
 		NeedDelRow: 1,
-		ReverseRow: 0,
+		ReverseRow: 4,
 		Cols: []string{"MajorEquipment", "Specifications", "Number", "Remark"},
 		Merge:   []string{},
 		ColsNum: 4,
@@ -152,14 +162,14 @@ func (this *SupplierDataEntryController) DocExport() {
 	//起止时间如何全部显示
 	var interfaceSlice4 = make([]interface{}, len(tabledata4))
 	for i, d := range tabledata4 {
-		d.StartTimeStr = d.StartTime.Format("2006-01-02")
+		d.StartTimeStr = d.StopTime.Format("2006-01-02")
 		interfaceSlice4[i] = d
 	}
 	datamap["ThreeYears"] = workflow.TableDetailData{
 		DataList:   interfaceSlice4,
 		StartRow:   2,
 		NeedDelRow: 1,
-		ReverseRow: 0,
+		ReverseRow: 4,
 		Cols: []string{"ProjectName", "BearContent", "OwnerUnit", "StartTimeStr", "StartTimeStr", "Tudge"},
 		Merge:   []string{},
 		ColsNum: 5,
@@ -174,7 +184,7 @@ func (this *SupplierDataEntryController) DocExport() {
 		DataList:   interfaceSlice5,
 		StartRow:   2,
 		NeedDelRow: 1,
-		ReverseRow: 0,
+		ReverseRow: 9,
 		Cols: []string{"Name", "Content", "ApprovalAuthority", "ApprovalDateStr"},
 		Merge:   []string{},
 		ColsNum: 4,
@@ -189,7 +199,7 @@ func (this *SupplierDataEntryController) DocExport() {
 		DataList:   interfaceSlice6,
 		StartRow:   2,
 		NeedDelRow: 1,
-		ReverseRow: 0,
+		ReverseRow: 8,
 		Cols: []string{"AwardName", "WinningTimeStr", "Authorities", "Remark"},
 		Merge:   []string{},
 		ColsNum: 4,