导出报告

src/dashoo.cn/backend/api/business/limsdoctemplate/limstemplateenum.go

@@ -131,5 +131,6 @@ const (
 	DAYT_PETROLEUMPIPE_DETAIL string = "DAYT.PetroleumPipe.Detail"
 	// 钻铤检测记录
 	DAYT_DRILLCOLLAR_DETAIL string = "DAYT.DrillCollar.Detail"
-
+	// 电动机报告
+	DAYT_LIMSREPORTMOTOR_REPORT string = "DAYT.LimsReportMotor.Report"
 )

src/dashoo.cn/backend/api/business/limsreportmotor/limsreportmotorService.go

@@ -1,8 +1,12 @@
 package limsreportmotor
 
 import (
+	"dashoo.cn/backend/api/business/limsentrust"
+	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/utils"
 	"github.com/go-xorm/xorm"
+	"strings"
 )
 
 type LimsReportMotorService struct {
@@ -14,3 +18,28 @@ func GetLimsReportMotorService(xormEngine *xorm.Engine) *LimsReportMotorService
 	s.DBE = xormEngine
 	return s
 }
+
+/**
+ * 生成[液压安全阀]报告
+ */
+func (s *LimsReportMotorService) DataToExcelReport(entrustMainEntity limsentrust.LimsEntrustMain, dateentryname string, createreportname string,tablename string, seqStr string, retUrl string, entrustId string, dataentryIds string) (reportUrl string, err error) {
+	var reportList []LimsReportMotor
+	s.GetEntitysByOrderbyWhere(tablename, "DataEntryId in ("+dataentryIds+")", "DataEntryId", &reportList)
+	//模板下载到服务器
+	//_dir := utils.Cfg.MustValue("file", "tmplateDir") + entrustId
+	fileurl := strings.Split(retUrl, "|")
+	templateUrl := "http://" + fileurl[0]
+	fileName := fileurl[1]
+
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	datamap := make(map[string]interface{})
+	datamap["key"] = "val"
+	svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+
+	//urlArr := strings.Split(template.FileURL, "|")
+	//templateUrl := "http://" + urlArr[0]
+	//fileName := urlArr[1]
+	//DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+	//err = nil
+	return 
+}

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

@@ -2,6 +2,7 @@ package lims
 
 import (
 	"dashoo.cn/backend/api/business/limsreportalerkrgas"
+	"dashoo.cn/backend/api/business/limsreportmotor"
 	"dashoo.cn/backend/api/business/limsreportdetHSgas"
 	"dashoo.cn/backend/api/business/limsreportdetelectoxygen"
 	"encoding/base64"
@@ -973,6 +974,10 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 		svc := limsreportdetelectoxygen.GetLimsReportOxygenSessionService(sessions)
 		reportUrl, err = svc.DataToExcelReport(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorCertificateName, 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:
+		seqStr := entrustMain.EntrustNo
+		svc := limsreportmotor.GetLimsReportMotorService(utils.DBE)
+		reportUrl, err = svc.DataToExcelReport(entrustMain, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportMotorName, seqStr, docTemplate.FileURL, entrustId, dataentryIds)
 	}
 
 	return reportUrl, UnHGReportUrl, err

src/dashoo.cn/frontend_web/src/pages/setting/testtype.vue

@@ -282,7 +282,7 @@
         this.$refs['testypeForm'].validate((valid) => {
           if (valid) {
             _this.testypeForm.DepartmentId = parseInt(_this.selectedorg[_this.selectedorg.length - 1])
-            _this.testypeForm.Department = this.$refs.refDepartment.currentLabels[this.$refs.refDepartment.currentLabels.length - 1]
+            // _this.testypeForm.Department = this.$refs.refDepartment.currentLabels[this.$refs.refDepartment.currentLabels.length - 1]
             if (_this.testypeForm.TemplateId > 0) {
               _this.testypeForm.TemplateName = _this.$refs.refTemplateId.selectedLabel + ''
               _this.testypeForm.TemplateId = parseInt(_this.testypeForm.TemplateId)