3
2
lining 6 лет назад
Родитель
Сommit
43a8c15d50

+ 2 - 0
src/dashoo.cn/backend/api/business/limsreportelecpumpwell/limsreportelecpumpwellService.go

@@ -80,6 +80,8 @@ func (s *LimsReportElecPumpWellService) DataToExcelReport(entrustMainEntity lims
 	datamap["qe"] = qe
 	datamap["h"] = h
 	datamap["etaxt"] = etaxt
+	datamap["rho"] = rho
+	datamap["py"] = py
 
 	if (etaxt >= limitval1) {
 		datamap["res1"] = "合格"

+ 4 - 2
src/dashoo.cn/backend/api/business/limsreportscrewpump/limsreportscrewpumpService.go

@@ -73,11 +73,13 @@ func (s *LimsReportScrewPumpService) DataToExcelReport(entrustMainEntity limsent
 	datamap["po"] = po
 	datamap["pt"] = pt
 	datamap["q"] = q
-	datamap["pdr1"] = pdr
+	datamap["pdr"] = pdr
 	datamap["cosphi"] = cosphi
-	datamap["lb1"] = lb
+	datamap["lb"] = lb
 	datamap["h"] = cosphi
+	datamap["py"] = py
 	datamap["etaxt"] = etaxt
+	datamap["rho"] = rho
 
 	if (etaxt >= limitval1) {
 		datamap["res1"] = "合格"