模板导出

src/dashoo.cn/backend/api/conf/app.conf

@@ -83,9 +83,9 @@ callbackHost=http://36dcae10.ngrok.io
 # AposeUrl=http://localhost:8080/acti-api/api/apose
 # BaseUrl=http://localhost:8080/acti-api/api/acti
 
-goodsModuleHost=http://weed1.labsop.cn:9390/3,28f046b04ec1
-basisModuleHost=http://weed1.labsop.cn:9390/6,28f159601b19
-techModuleHost=http://weed1.labsop.cn:9390/5,299cfc86c767
+goodsModuleHost=http://weed1.labsop.cn:9390/1,2a1e59751ada
+basisModuleHost=http://weed1.labsop.cn:9390/4,2a2482291a1d
+techModuleHost=http://weed1.labsop.cn:9390/1,2a21ddff97a3
 goodsPdfHost=http://weed1.labsop.cn:9390/4,272c38746f9a
 basisPdfHost=http://weed1.labsop.cn:9390/6,272dc8ca68d1
 techPdfHost=http://weed1.labsop.cn:9390/1,272e1bdabf62

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

@@ -209,68 +209,96 @@ func (this *SupplierDataEntryController) DocExport() {
 		datamap["Name"] = ""
 	}
 
-	var interfaceSlice3 = make([]interface{}, len(tabledata3))
-	for i, d := range tabledata3 {
-		interfaceSlice3[i] = d
-	}
-	datamap["MajorEquipments"] = workflow.TableDetailData{
-		DataList:   interfaceSlice3,
-		StartRow:   2,
-		NeedDelRow: 1,
-		ReverseRow: 4,
-		Cols: []string{"MajorEquipment", "Specifications", "Number", "Remark"},
-		Merge:   []string{},
-		ColsNum: 4,
+	for i,item := range tabledata3 {
+		datamap["MajorEquipments" + strconv.Itoa(i + 1)] = item.MainEquipment
+		datamap["Specifications" + strconv.Itoa(i + 1)] = item.Specifications
+		datamap["Number" + strconv.Itoa(i + 1)] = item.Number
+		datamap["Remark" + strconv.Itoa(i + 1)] = item.Remark
 	}
 
-	//起止时间如何全部显示
-	var interfaceSlice4 = make([]interface{}, len(tabledata4))
-	for i, d := range tabledata4 {
-		d.StartTimeStr = d.StopTime.Format("2006-01-02")
-		interfaceSlice4[i] = d
-	}
-	datamap["ThreeYears"] = workflow.TableDetailData{
-		DataList:   interfaceSlice4,
-		StartRow:   2,
-		NeedDelRow: 1,
-		ReverseRow: 4,
-		Cols: []string{"ProjectName", "BearContent", "OwnerUnit", "StartTimeStr", "StartTimeStr", "Tudge"},
-		Merge:   []string{},
-		ColsNum: 5,
+	for i,item := range tabledata4 {
+		datamap["ProjectName" + strconv.Itoa(i + 1)] = item.ProjectName
+		datamap["BearContent" + strconv.Itoa(i + 1)] = item.BearContent
+		datamap["TimeStr" + strconv.Itoa(i + 1)] = item.StartTime.Format("2006-01-02") + "--" + item.StopTime.Format("2006-01-02")
+		datamap["Tudge" + strconv.Itoa(i + 1)] = item.Tudge
 	}
 
-	var interfaceSlice5 = make([]interface{}, len(tabledata5))
-	for i, d := range tabledata5 {
-		d.ApprovalDateStr = d.ApprovalDate.Format("2006-01-02")
-		interfaceSlice5[i] = d
-	}
-	datamap["Patent"] = workflow.TableDetailData{
-		DataList:   interfaceSlice5,
-		StartRow:   2,
-		NeedDelRow: 1,
-		ReverseRow: 9,
-		Cols: []string{"Name", "Content", "ApprovalAuthority", "ApprovalDateStr"},
-		Merge:   []string{},
-		ColsNum: 4,
+	for i,item := range tabledata5 {
+		datamap["Patent" + strconv.Itoa(i + 1)] = item.Name
+		datamap["Pcontent" + strconv.Itoa(i + 1)] = item.Content
+		datamap["ApprovalAuthority" + strconv.Itoa(i + 1)] = item.ApprovalAuthority
+		datamap["ApprovalDateStr" + strconv.Itoa(i + 1)] = item.ApprovalDate.Format("2006-01-02")
 	}
 
-	var interfaceSlice6 = make([]interface{}, len(tabledata6))
-	for i, d := range tabledata6 {
-		d.WinningTimeStr = d.WinningTime.Format("2006-01-02")
-		interfaceSlice6[i] = d
+	for i,item := range tabledata6 {
+		datamap["AwardName" + strconv.Itoa(i + 1)] = item.AwardName
+		datamap["WinningTimeStr" + strconv.Itoa(i + 1)] = item.WinningTime.Format("2006-01-02")
+		datamap["Authorities" + strconv.Itoa(i + 1)] = item.Authorities
+		datamap["Remark" + strconv.Itoa(i + 1)] = item.Remark
 	}
-	datamap["Winning"] = workflow.TableDetailData{
-		DataList:   interfaceSlice6,
-		StartRow:   2,
-		NeedDelRow: 1,
-		ReverseRow: 8,
-		Cols: []string{"AwardName", "WinningTimeStr", "Authorities", "Remark"},
-		Merge:   []string{},
-		ColsNum: 4,
-	}
-	datamap["TableComment"] = []string{"MajorEquipments", "ThreeYears", "Patent", "Winning"}
-	//retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
-	retDocUrl := svcActiviti.FillWordWatermarkTemplate(datamap, Url, fileName, model1.SupplierName)
+
+	//var interfaceSlice3 = make([]interface{}, len(tabledata3))
+	//for i, d := range tabledata3 {
+	//	interfaceSlice3[i] = d
+	//}
+	//datamap["MajorEquipments"] = workflow.TableDetailData{
+	//	DataList:   interfaceSlice3,
+	//	StartRow:   28,
+	//	NeedDelRow: 5,
+	//	ReverseRow: 0,
+	//	Cols: []string{"MajorEquipment", "Specifications", "Number", "Remark"},
+	//	Merge:   []string{"1,3"},
+	//	ColsNum: 18,
+	//}
+	//
+	////起止时间如何全部显示
+	//var interfaceSlice4 = make([]interface{}, len(tabledata4))
+	//for i, d := range tabledata4 {
+	//	d.StartTimeStr = d.StopTime.Format("2006-01-02")
+	//	interfaceSlice4[i] = d
+	//}
+	//datamap["ThreeYears"] = workflow.TableDetailData{
+	//	DataList:   interfaceSlice4,
+	//	StartRow:   35,
+	//	NeedDelRow: 5,
+	//	ReverseRow: 0,
+	//	Cols: []string{"ProjectName", "BearContent", "OwnerUnit", "StartTimeStr", "StartTimeStr", "Tudge"},
+	//	Merge:   []string{},
+	//	ColsNum: 5,
+	//}
+	//
+	//var interfaceSlice5 = make([]interface{}, len(tabledata5))
+	//for i, d := range tabledata5 {
+	//	d.ApprovalDateStr = d.ApprovalDate.Format("2006-01-02")
+	//	interfaceSlice5[i] = d
+	//}
+	//datamap["Patent"] = workflow.TableDetailData{
+	//	DataList:   interfaceSlice5,
+	//	StartRow:   42,
+	//	NeedDelRow: 7,
+	//	ReverseRow: 0,
+	//	Cols: []string{"Name", "Content", "ApprovalAuthority", "ApprovalDateStr"},
+	//	Merge:   []string{},
+	//	ColsNum: 4,
+	//}
+	//
+	//var interfaceSlice6 = make([]interface{}, len(tabledata6))
+	//for i, d := range tabledata6 {
+	//	d.WinningTimeStr = d.WinningTime.Format("2006-01-02")
+	//	interfaceSlice6[i] = d
+	//}
+	//datamap["Winning"] = workflow.TableDetailData{
+	//	DataList:   interfaceSlice6,
+	//	StartRow:   51,
+	//	NeedDelRow: 9,
+	//	ReverseRow: 0,
+	//	Cols: []string{"AwardName", "WinningTimeStr", "Authorities", "Remark"},
+	//	Merge:   []string{},
+	//	ColsNum: 4,
+	//}
+	//datamap["TableComment"] = []string{"MajorEquipments", "ThreeYears", "Patent", "Winning"}
+	retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
+	//retDocUrl := svcActiviti.FillWordWatermarkTemplate(datamap, Url, fileName, model1.SupplierName)
 	var datainfo ErrorDataInfo
 	datainfo.Code = 0
 	datainfo.Item = retDocUrl