计量数据录入导出后台添加

src/dashoo.cn/backend/api/business/limsreportben/limsreportbenSessionService.go

@@ -61,7 +61,7 @@ func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry,
 	}
 	where := "a.Id = "+dataentryid
 	var sql string
-	sql = ` select a.*,b.* from 
+	sql = ` select a.Id DataEntryId, b.Id Id, a.*,b.* from 
 	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
 	fmt.Println(sql)
 	s.Session.Sql(sql).Get(&entity)

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -36,8 +36,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://192.168.0.171:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
-	//s.OriginUrl = "http://localhost:8081/api"
-	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	s.OriginUrl = "http://192.168.0.166:8081/api"
+	//s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
 	//s.AposeUrl = "http://localhost:8081/api/apose"
 	//s.AposeUrl = "http://192.168.0.171:8081/api/apose"
 	s.Username = "leader"

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -1,6 +1,15 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/limsreportalercarbon"
+	"dashoo.cn/backend/api/business/limsreportalerfhgas"
+	"dashoo.cn/backend/api/business/limsreportalerkrgas"
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"dashoo.cn/backend/api/business/limsreportanal1carbonredgas"
+	"dashoo.cn/backend/api/business/limsreportanal2carbonredgas"
+	"dashoo.cn/backend/api/business/limsreportben"
+	"dashoo.cn/backend/api/business/limsreportdetHSgas"
+	"dashoo.cn/backend/api/business/limsreportdetelectoxygen"
 	"dashoo.cn/backend/api/business/limsreportelecpumpwell"
 	"dashoo.cn/backend/api/business/limsreportheatingfurnace"
 	"dashoo.cn/backend/api/business/limsreportliquidtransportation"
@@ -1494,6 +1503,920 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			DocUrl = ""
 			err = errors.New("")
 		}
+	case limsdoctemplate.DAYT_REPORTALERTORBENDETECT_DETAIL:
+		// 苯气检测报警器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportben.GetLimsReportBenSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorValueName, where, "Id desc", &alertvaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
+		}
+		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
+		for i, d := range alertvaluelist {
+			alertvalinterfaceSlice[i] = d
+		}
+		datamap["AlertVal"] = workflow.TableDetailData{
+			DataList: alertvalinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"AlertFunction","Value1","Value2","Value3","ActionValue"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 10,
+		}
+		datamap["TableComment"] = []string{"AlertVal","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTALERTORCARBONDETECT_DETAIL:
+		// 一氧化碳检测报警器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportalercarbon.GetlimsReportAlerCarbonSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","DeviationAbs","DeviationRelative"},
+			Merge: []string{},
+			ColsNum: 7,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 8,
+		}
+		datamap["TableComment"] = []string{"Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTALERTORFHGASDETECT_DETAIL:
+		// 复合气体检测报警器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportalerfhgas.GetLimsReportAlerFHSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorValueName, where, "Id desc", &alertvaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
+		for i, d := range alertvaluelist {
+			alertvalinterfaceSlice[i] = d
+		}
+		datamap["AlertVal"] = workflow.TableDetailData{
+			DataList: alertvalinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"AlertFunction","Value1","Value2","Value3","ActionValue"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 10,
+		}
+		datamap["TableComment"] = []string{"AlertVal","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTALERTORKRGASDETECT_DETAIL:
+		// 可燃气体检测报警器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportalerkrgas.GetLimsReportAlerKRSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorValueName, where, "Id desc", &alertvaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
+		for i, d := range alertvaluelist {
+			alertvalinterfaceSlice[i] = d
+		}
+		datamap["AlertVal"] = workflow.TableDetailData{
+			DataList: alertvalinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"AlertFunction","Value1","Value2","Value3","ActionValue"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 10,
+		}
+		datamap["TableComment"] = []string{"AlertVal","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTANALYZER1CARBONREDGAS_DETAIL:
+		// 一氧化碳红外气体分析器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportanal1carbonredgas.GetLimsReportAlCarbon1SessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertotherlist []limsreportalertor.LimsReportAlertorOther
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorOtherName, where, "Id", &alertotherlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var alertotherinterfaceSlice []interface{} = make([]interface{}, len(alertotherlist))
+		for i, d := range alertotherlist {
+			alertotherinterfaceSlice[i] = d
+		}
+		datamap["Other"] = workflow.TableDetailData{
+			DataList: alertotherinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","OtherValue"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 8,
+		}
+		datamap["TableComment"] = []string{"Other","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTANALYZER2CARBONREDGAS_DETAIL:
+		// 二氧化碳红外气体分析器检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportanal2carbonredgas.GetLimsReportAlCarbon2SessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertotherlist []limsreportalertor.LimsReportAlertorOther
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorOtherName, where, "Id", &alertotherlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var alertotherinterfaceSlice []interface{} = make([]interface{}, len(alertotherlist))
+		for i, d := range alertotherlist {
+			alertotherinterfaceSlice[i] = d
+		}
+		datamap["Other"] = workflow.TableDetailData{
+			DataList: alertotherinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","Value0","Value1","Value2","Value3","OtherValue"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 8,
+		}
+		datamap["TableComment"] = []string{"Other","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTDETECTORELECTOXYGEN_DETAIL:
+		// 电化学氧测定仪检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportdetelectoxygen.GetLimsReportOxygenSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 8,
+		}
+		datamap["TableComment"] = []string{"Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
+	case limsdoctemplate.DAYT_REPORTDETECTORHSGAS_DETAIL:
+		// 硫化氢气体检测仪检定记录
+		sessions := utils.DBE.NewSession()
+		svc := limsreportdetHSgas.GetLimsReportDetHsSessionService(sessions)
+		var mainmodel limsreportalertor.LimsAlertorMainModel
+		var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+		var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+		var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+		var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+		var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+		var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+		where := " DataEntryId = " + strconv.Itoa(dataentrylist.Id)
+		mainmodel = svc.GetEntityByOrderbyWhereMain(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, "a.Id", strconv.Itoa(dataentrylist.Id))
+		fmt.Println(mainmodel)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorCertificateName, where, "Id", &cervaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorValueName, where, "Id desc", &alertvaluelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorDeviationName, where, "Id desc", &alertdeviationlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorRepeatName, where, "Id desc", &alertrepeatlist)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsReportAlertorShiftName, where, "Id desc", &alertshiftlist)
+		//session := utils.DBE.NewSession()
+		//var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		//svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		//var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		//where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		//has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		//wheretable := "MId=" + strconv.Itoa(model.Id)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		datamap := StructToMapDemo(mainmodel)
+		datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+		for i := 0; i< len(cervaluelist); i++{
+			datamap["CerNum"+ utils.ToStr(i)] = cervaluelist[i].CerNum
+			datamap["StandardUnit"+ utils.ToStr(i)] = cervaluelist[i].StandardUnit
+			datamap["StandVal"+ utils.ToStr(i)] = cervaluelist[i].StandVal
+			datamap["Uncertainty"+ utils.ToStr(i)] = cervaluelist[i].Uncertainty
+			datamap["EffectDate"+ utils.ToStr(i)] = cervaluelist[i].EffectDate
+		}
+		var alertvalinterfaceSlice []interface{} = make([]interface{}, len(alertvaluelist))
+		for i, d := range alertvaluelist {
+			alertvalinterfaceSlice[i] = d
+		}
+		datamap["AlertVal"] = workflow.TableDetailData{
+			DataList: alertvalinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"SureValue","Value1","Value2","Value3","MaxValue","AllowValue"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var deviainterfaceSlice []interface{} = make([]interface{}, len(alertdeviationlist))
+		for i, d := range alertdeviationlist {
+			deviainterfaceSlice[i] = d
+		}
+		datamap["Deviation"] = workflow.TableDetailData{
+			DataList: deviainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 3,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","AvgValue","Deviation"},
+			Merge: []string{},
+			ColsNum: 6,
+		}
+		var responinterfaceSlice []interface{} = make([]interface{}, len(alertresponsetimelist))
+		for i, d := range alertresponsetimelist {
+			responinterfaceSlice[i] = d
+		}
+		datamap["Response"] = workflow.TableDetailData{
+			DataList: responinterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Deviation"},
+			Merge: []string{},
+			ColsNum: 5,
+		}
+		var repeainterfaceSlice []interface{} = make([]interface{}, len(alertrepeatlist))
+		for i, d := range alertrepeatlist {
+			repeainterfaceSlice[i] = d
+		}
+		datamap["Repeat"] = workflow.TableDetailData{
+			DataList: repeainterfaceSlice,
+			StartRow: 2,
+			NeedDelRow: 1,
+			ReverseRow: 0,
+			Cols: []string{"GasValue","Value1","Value2","Value3","Value4","Value5","Value6","AvgValue","RepeatValue"},
+			Merge: []string{},
+			ColsNum: 9,
+		}
+		var shiftinterfaceSlice []interface{} = make([]interface{}, len(alertshiftlist))
+		for i, d := range alertshiftlist {
+			shiftinterfaceSlice[i] = d
+		}
+		datamap["Shift"] = workflow.TableDetailData{
+			DataList: shiftinterfaceSlice,
+			StartRow: 1,
+			NeedDelRow: 2,
+			ReverseRow: 0,
+			Cols: []string{"ValueType","value0","Value1","Value2","Value3","Value4","Value5","Value6","ZeroValue","ShowValue"},
+			Merge: []string{},
+			ColsNum: 10,
+		}
+		datamap["TableComment"] = []string{"AlertVal","Deviation","Response","Repeat","Shift"}
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
 	}
 	return DocUrl, err
 }

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalercarbon.go

@@ -84,6 +84,9 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportalercarbon.GetlimsReportAlerCarbonSessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -124,7 +127,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -144,7 +147,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -163,7 +166,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -182,7 +185,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	//		avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
 	//		avalentity.EId = model.EId
 	//		avalentity.TaskBalanceId = model.TaskBalanceId
-	//		avalentity.DataEntryId = dataentrymodel.Id
+	//		avalentity.DataEntryId = model.BenMainform.DataEntryId
 	//		avalentity.CreateOn = time.Now()
 	//		avalentity.CreateBy = this.User.Realname
 	//		avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -205,7 +208,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 			devientity.DeviationAbs = model.DeviationArrayList[i].DeviationAbs
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -223,7 +226,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -244,7 +247,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -268,7 +271,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -405,6 +408,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -442,6 +448,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -504,6 +513,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.DeviationRelative != 0 || devientity.DeviationAbs != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -539,6 +551,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -581,6 +596,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -624,6 +642,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportben.go

@@ -185,7 +185,7 @@ func (this *LimsReportBenController) AddEntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.BenMainform.EId
 	almodel.TaskBalanceId = model.BenMainform.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -205,7 +205,7 @@ func (this *LimsReportBenController) AddEntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.BenMainform.EId
 			cerentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -224,7 +224,7 @@ func (this *LimsReportBenController) AddEntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.BenMainform.EId
 	cerentity2.TaskBalanceId = model.BenMainform.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -243,7 +243,7 @@ func (this *LimsReportBenController) AddEntity() {
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
 			avalentity.EId = model.BenMainform.EId
 			avalentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -265,7 +265,7 @@ func (this *LimsReportBenController) AddEntity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.BenMainform.EId
 			devientity.TaskBalanceId = model.BenMainform.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -284,7 +284,7 @@ func (this *LimsReportBenController) AddEntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.BenMainform.EId
 	reponseentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -305,7 +305,7 @@ func (this *LimsReportBenController) AddEntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.BenMainform.EId
 	repeatentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -329,7 +329,7 @@ func (this *LimsReportBenController) AddEntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.BenMainform.EId
 			shiftentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -472,7 +472,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					cerentity.EId = model.BenMainform.EId
 					cerentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-					cerentity.DataEntryId = dataentrymodel.Id
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -511,7 +511,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			cerentity2.EId = model.BenMainform.EId
 			cerentity2.TaskBalanceId = model.BenMainform.TaskBalanceId
-			cerentity2.DataEntryId = dataentrymodel.Id
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -548,7 +548,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					avalentity.EId = model.BenMainform.EId
 					avalentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-					avalentity.DataEntryId = dataentrymodel.Id
+					avalentity.DataEntryId = model.BenMainform.DataEntryId
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 				}
 			}
@@ -589,7 +589,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					devientity.EId = model.BenMainform.EId
 					devientity.TaskBalanceId = model.BenMainform.TaskBalanceId
-					devientity.DataEntryId = dataentrymodel.Id
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -628,7 +628,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				reponseentity.EId = model.BenMainform.EId
 				reponseentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-				reponseentity.DataEntryId = dataentrymodel.Id
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -673,7 +673,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				repeatentity.EId = model.BenMainform.EId
 				repeatentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-				repeatentity.DataEntryId = dataentrymodel.Id
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -720,7 +720,7 @@ func (this *LimsReportBenController) UpdateEntity() {
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					shiftentity.EId = model.BenMainform.EId
 					shiftentity.TaskBalanceId = model.BenMainform.TaskBalanceId
-					shiftentity.DataEntryId = dataentrymodel.Id
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorbendetect/_opera/operation.vue

@@ -677,6 +677,7 @@
       // } else {
       //   this.formData.Id = 0;
       // }
+      console.log("--------",)
     },
     methods: {
       initDatas() {

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorcarbondetect/_opera/operation.vue

@@ -577,7 +577,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -588,7 +588,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -626,8 +626,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.deviitem != null) {

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorfhgasdetect/_opera/operation.vue

@@ -608,7 +608,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -619,7 +619,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -657,8 +657,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -600,7 +600,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -611,7 +611,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -649,8 +649,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer1carbonredgas/_opera/operation.vue

@@ -586,7 +586,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -597,7 +597,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -651,8 +651,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer2carbonredgas/_opera/operation.vue

@@ -586,7 +586,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -597,7 +597,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -647,8 +647,8 @@
     },
     methods: {
       initDatas() {
-       if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+       if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorHSgas/_opera/operation.vue

@@ -26,6 +26,13 @@
               <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定日期:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="环境温度:">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%"></el-input>
@@ -599,7 +606,7 @@
         //漂移
         ShiftData: [{
           Id: 0,
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -611,7 +618,7 @@
           ShowValue: ''
         }, {
           Id: 0,
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -649,8 +656,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorelectoxygen/_opera/operation.vue

@@ -545,7 +545,7 @@
         }],
         //漂移
         ShiftData: [{
-          ValueType: '零点',
+          ValueType: '零点示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -556,7 +556,7 @@
           ZeroValue: '',
           ShowValue: ''
         }, {
-          ValueType: '示值',
+          ValueType: '量程示值',
           value0: '',
           Value1: '',
           Value2: '',
@@ -594,8 +594,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.deviitem != null) {