|
|
@@ -1463,7 +1463,23 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
|
|
|
datamap["HFProDate"] = model.HFProDate.Format("2006年01月02日")
|
|
|
datamap["CheckDate"] = model.CheckDate.Format("2006年01月02日")
|
|
|
datamap["BurnerProDate"] = model.BurnerProDate.Format("2006年01月02日")
|
|
|
- datamap["TableData"] = tabledata
|
|
|
+
|
|
|
+ var interfaceSlice []interface{} = make([]interface{}, len(tabledata))
|
|
|
+ for i, d := range tabledata {
|
|
|
+ interfaceSlice[i] = d
|
|
|
+ }
|
|
|
+ datamap["TableData"] = workflow.TableDetailData{
|
|
|
+ DataList: interfaceSlice,
|
|
|
+ StartRow: 9,
|
|
|
+ NeedDelRow: 5,
|
|
|
+ ReverseRow: 0,
|
|
|
+ Cols: []string{"OrderNo","TestTime","LeftTemperature1","LeftTemperature2","LeftTemperature3","LeftTemperature4",
|
|
|
+ "RichtTemperature1","RichtTemperature2","RichtTemperature3","RichtTemperature4","ExhaustTemperature","Oxygen","SulfurDioxide","CarbonMonoxide","CarbonDioxide"},
|
|
|
+ Merge: []string{"2,3","3,4","5,6","6,7","7,8","8,9","9,10","10,12","11,12","12,13"},
|
|
|
+ ColsNum: 26,
|
|
|
+ }
|
|
|
+ datamap["TableComment"] = []string{"TableData"}
|
|
|
+
|
|
|
svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
var template limsdoctemplate.LimsDocTemplate
|
|
|
wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
|