打印处室审批意见

src/dashoo.cn/backend/api/business/oilsupplier/supplierdataentry/supplierdataentry.go

@@ -2,6 +2,7 @@ package supplierdataentry
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"time"
 )
 
@@ -12,19 +13,7 @@ type SupplierDataEntry struct {
 }
 
 type SupplierCertDataEntry struct {
-	Id               	int       `xorm:"not null pk autoincr INT(10)"`
-	SupplierId   	 	int       `xorm:"INT(10)"`
-	SupplierTypeCode 	string    `xorm:"VARCHAR(5)"`
-	WorkerTotal         string	  `xorm:"comment('企业员工总数') VARCHAR(10)"`
-	ContractNum    		string	  `xorm:"comment('合同化用工数量') VARCHAR(10)"`
-	UniversityNum  		string	  `xorm:"not null default '0' comment('大学及以上学历人员数量') VARCHAR(10)"`
-	TechnicalNum        string	  `xorm:"comment('技术、管理人员数量') VARCHAR(20)"`
-	AboveProfNum  		string	  `xorm:"comment('高级及以上职称人员数量') VARCHAR(100)"`
-	MiddleProfNum   	string	  `xorm:"comment('中级职称人员数量') VARCHAR(100)"`
-	NationalRegNum      string	  `xorm:"comment('具有国家注册执业资格人员数量') VARCHAR(100)"`
-	NationalCertTotal 	string	  `xorm:"comment('具有国家注册执业资格证书总数') VARCHAR(100)"`
-	DesignerTotal       string	  `xorm:"comment('设计人员总数') VARCHAR(100)"`
-	SkillerTotal  		string    `xorm:"comment('技术工人总数') VARCHAR(100)"`
+	suppliercert.OilSupplierCert  `xorm:"extends"`
 }
 
 type SupplierMajorEquipmentDataEntry struct {

src/dashoo.cn/backend/api/conf/app.conf

@@ -83,9 +83,9 @@ callbackHost=http://36dcae10.ngrok.io
 # AposeUrl=http://localhost:8080/acti-api/api/apose
 # BaseUrl=http://localhost:8080/acti-api/api/acti
 
-goodsModuleHost=http://weed1.labsop.cn:9390/3,255b9fa42e11
-basisModuleHost=http://weed1.labsop.cn:9390/6,255cf143a0f3
-techModuleHost=http://weed1.labsop.cn:9390/5,255d5b2ece8c
+goodsModuleHost=http://weed1.labsop.cn:9390/1,260f8721befc
+basisModuleHost=http://weed1.labsop.cn:9390/2,26101dab3692
+techModuleHost=http://weed1.labsop.cn:9390/3,261195740758
 goodsPdfHost=http://weed1.labsop.cn:9390/4,25ab20466969
 basisPdfHost=http://weed1.labsop.cn:9390/3,25ac524b9715
 techPdfHost=http://weed1.labsop.cn:9390/6,25ad0b7df344

src/dashoo.cn/backend/api/controllers/oilsupplier/supplierdataentry.go

@@ -60,6 +60,7 @@ func (this *SupplierDataEntryController) DocExport() {
 	Id := this.Ctx.Input.Param(":tbid")
 	var Url string
 	var fileName string
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var model1 supplierdataentry.SupplierDataEntry
 	var model2 supplierdataentry.SupplierCertDataEntry
 
@@ -70,6 +71,12 @@ func (this *SupplierDataEntryController) DocExport() {
 	svc.GetEntityByWhere(OilSupplierName, where1, &model1)
 	svc.GetEntityByWhere(OilSupplierCertName, where2, &model2)
 
+	businessKey := model2.BusinessKey
+	processKey := model2.ProcessKey
+	processInstanceId := model2.WorkflowId
+	var historicTasks []workflow.ActiHistoricTask
+	historicTasks = svcActiviti.GetHistoricMultiTasks(processKey, businessKey, processInstanceId)
+
 	var tabledata3 []supplierdataentry.SupplierMajorEquipmentDataEntry
 	var tabledata4 []supplierdataentry.SupplierThreeYearsDataEntryView
 	var tabledata5 []supplierdataentry.SupplierPatentDataEntryView
@@ -140,6 +147,13 @@ func (this *SupplierDataEntryController) DocExport() {
 	datamap["BusinessScope"] = model1.BusinessScope
 	datamap["Telphone"] = model1.Telphone
 
+	//审批意见
+	for i := 0; i < len(historicTasks); i++ {
+		if historicTasks[i].TaskName == "业务处室专业审批" {
+			datamap["OfficeRemarks"] = historicTasks[i].Remarks
+		}
+	}
+
 	//model2
 	datamap["WorkerTotal"] = model2.WorkerTotal
 	datamap["ContractNum"] = model2.ContractNum
@@ -224,9 +238,6 @@ func (this *SupplierDataEntryController) DocExport() {
 	}
 	datamap["TableComment"] = []string{"MajorEquipments", "ThreeYears", "Patent", "Winning"}
 
-	svcActiviti := workflow.GetActivitiService(utils.DBE)
-
-
 	retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
 	var datainfo ErrorDataInfo
 	datainfo.Code = 0