冲突

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

@@ -1,28 +1,28 @@
 package lims
 
 import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"os"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
 	"dashoo.cn/backend/api/business/limsreportalercarbon"
 	"dashoo.cn/backend/api/business/limsreportalerkrgas"
 	"dashoo.cn/backend/api/business/limsreportanal1carbonredgas"
-	"dashoo.cn/backend/api/business/limsreportheatingfurnace"
-	"dashoo.cn/backend/api/business/limsreportliquidtransportation"
 	"dashoo.cn/backend/api/business/limsreportanal2carbonredgas"
 	"dashoo.cn/backend/api/business/limsreportben"
-	"dashoo.cn/backend/api/business/limsreportmotor"
 	"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"
 	"dashoo.cn/backend/api/business/limsreportmotor"
 	"dashoo.cn/backend/api/business/limsreportpistonpumpunit"
 	"dashoo.cn/backend/api/business/limsreportscrewpump"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"os"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
 
 	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/limscreatereport"
@@ -1004,7 +1004,7 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 	case limsdoctemplate.DAYT_REPORTANALYZER1CARBONREDGAS_REPORT:
 		seqStr := entrustMain.EntrustNo
 		sessions := utils.DBE.NewSession()
-		svc := limsreportanal1carbonredgas.GetLimsReportAlCarbon1SessionService (sessions)
+		svc := limsreportanal1carbonredgas.GetLimsReportAlCarbon1SessionService(sessions)
 		reportUrl, err = svc.DataToExcelReport(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorCertificateName, this.User.AccCode+LimsReportAlertorOtherName, this.User.AccCode+LimsReportAlertorDeviationName, this.User.AccCode+LimsReportAlertorResponseTimeName, this.User.AccCode+LimsReportAlertorRepeatName, this.User.AccCode+LimsReportAlertorShiftName, seqStr, docTemplate.FileURL, entrustId, dataentryIds)
 		//二氧化碳红外检定证书
 	case limsdoctemplate.DAYT_REPORTANALYZER2CARBONREDGAS_REPORT:
@@ -1013,7 +1013,6 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 		svc := limsreportanal2carbonredgas.GetLimsReportAlCarbon2SessionService(sessions)
 		reportUrl, err = svc.DataToExcelReport(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorCertificateName, this.User.AccCode+LimsReportAlertorOtherName, this.User.AccCode+LimsReportAlertorDeviationName, this.User.AccCode+LimsReportAlertorResponseTimeName, this.User.AccCode+LimsReportAlertorRepeatName, this.User.AccCode+LimsReportAlertorShiftName, seqStr, docTemplate.FileURL, entrustId, dataentryIds)
 
-
 		// 电动机
 	case limsdoctemplate.DAYT_LIMSREPORTMOTOR_REPORT:
 		codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
@@ -1026,7 +1025,7 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 		seqStr := codecSvc.GetReportElecPumpWell(this.User.AccCode)
 		seqStrJS := codecSvc.GetReportElecPumpWellJS(this.User.AccCode)
 		svc := limsreportelecpumpwell.GetLimsReportElecPumpWellService(utils.DBE)
-		reportUrl, err = svc.DataToExcelReport(entrustMain, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportElecPumpWellName, seqStr, seqStrJS,docTemplate.FileURL, entrustId, dataentryIds)
+		reportUrl, err = svc.DataToExcelReport(entrustMain, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportElecPumpWellName, seqStr, seqStrJS, docTemplate.FileURL, entrustId, dataentryIds)
 	case limsdoctemplate.DAYT_REPORTPISTONPUMPUNIT_REPORT:
 		// 柱塞泵机组
 		codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)