|
|
@@ -9,6 +9,7 @@ import (
|
|
|
baseparameter "dashoo.cn/business2/parameter"
|
|
|
"dashoo.cn/business2/permission"
|
|
|
"log"
|
|
|
+ "sort"
|
|
|
"sync"
|
|
|
|
|
|
"dashoo.cn/backend/api/business/baseUser"
|
|
|
@@ -423,6 +424,7 @@ func (this *OilContractReviewController) DocExport() {
|
|
|
var Url string
|
|
|
var fileName string
|
|
|
svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
+ userSvc := baseUser.GetBaseUserService(utils.DBE)
|
|
|
|
|
|
var model contractReview.OilContractReview
|
|
|
svc := contractReview.GetOilContractReviewService(utils.DBE)
|
|
|
@@ -467,8 +469,6 @@ func (this *OilContractReviewController) DocExport() {
|
|
|
normal, _ := strconv.ParseFloat(v.NormalScore, 64)
|
|
|
normalScore = normalScore + (normal / count)
|
|
|
}
|
|
|
- } else {
|
|
|
- datamap["bool_"+utils.ToStr(v.ItemId)] = If(v.Value == 1, "是", "否")
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -478,8 +478,8 @@ func (this *OilContractReviewController) DocExport() {
|
|
|
supplierSvc.GetEntityByIdBytbl(OilSupplierName, contractModel.SupplierId, &supplierEntity)
|
|
|
|
|
|
datamap["Score"] = utils.ToStr(score)
|
|
|
- datamap["Standard"] = utils.ToStr(normalScore)
|
|
|
- datamap["Discount"] = score
|
|
|
+ datamap["Standard"] = 100
|
|
|
+ datamap["Discount"] = score * 0.75
|
|
|
|
|
|
if contractModel.Id != 0 {
|
|
|
datamap["Amount"] = contractModel.IsYearMoney
|
|
|
@@ -553,12 +553,77 @@ func (this *OilContractReviewController) DocExport() {
|
|
|
fileName = "服务商日常业绩评价表模板.docx"
|
|
|
Url = utils.Cfg.MustValue("workflow", "reviewServiceUrl")
|
|
|
}
|
|
|
+ var historicTasks []workflow.ActiHistoricTask
|
|
|
+ historicTasks = svcActiviti.GetHistoricTasks(model.ProcessKey, Id, model.WorkflowId)
|
|
|
+ sort.Slice(historicTasks, func(i, j int) bool {
|
|
|
+ return historicTasks[i].StartTime < historicTasks[j].StartTime
|
|
|
+ })
|
|
|
|
|
|
t := time.Now()
|
|
|
datamap["CreateDate"] = t.Format("2006年01月02日")
|
|
|
datamap["Year"] = t.Format("2006")
|
|
|
+ for _, value := range historicTasks {
|
|
|
+ if value.TaskName == "日常评价" && value.StartTime > 0 {
|
|
|
+ StartTime := time.Unix(value.StartTime / 1000, 0)
|
|
|
+ datamap["CreateDate"] = StartTime.Format("2006年01月02日")
|
|
|
+ datamap["Year"] = StartTime.Format("2006")
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
datamap["Creater"] = this.User.Realname
|
|
|
|
|
|
+ if model.FirstAudit > 0 && model.ProcessKey == "oil_daily_contract_evaluation" {
|
|
|
+ var userEntity userRole.Base_User
|
|
|
+ userSvc.GetEntityById(model.FirstAudit, &userEntity)
|
|
|
+ if userEntity.Id > 0 {
|
|
|
+ datamap["Create1"] = userEntity.Realname
|
|
|
+ datamap["CreateDate1"] = " 年 月 日"
|
|
|
+ for _, value := range historicTasks {
|
|
|
+ if value.TaskName == "二级单位初审" && value.EndTime > 0 {
|
|
|
+ EndTime := time.Unix(value.EndTime / 1000, 0)
|
|
|
+ datamap["CreateDate1"] = EndTime.Format("2006年01月02日")
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if model.ProcessKey == "oil_daily_contract_eva_by_business" {
|
|
|
+ datamap["Create1"] = this.User.Realname
|
|
|
+ datamap["CreateDate1"] = datamap["CreateDate"]
|
|
|
+ }
|
|
|
+
|
|
|
+ if model.SecondAudit > 0 && model.ProcessKey == "oil_daily_contract_evaluation" {
|
|
|
+ var userEntity userRole.Base_User
|
|
|
+ userSvc.GetEntityById(model.SecondAudit, &userEntity)
|
|
|
+ if userEntity.Id > 0 {
|
|
|
+ datamap["Create2"] = userEntity.Realname
|
|
|
+ datamap["CreateDate2"] = " 年 月 日"
|
|
|
+ for _, value := range historicTasks {
|
|
|
+ if value.TaskName == "二级单位复审" && value.EndTime > 0 {
|
|
|
+ EndTime := time.Unix(value.EndTime / 1000, 0)
|
|
|
+ datamap["CreateDate2"] = EndTime.Format("2006年01月02日")
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if model.ProfessionalAudit > 0 && model.ProcessKey == "oil_daily_contract_eva_by_business" {
|
|
|
+ var userEntity userRole.Base_User
|
|
|
+ userSvc.GetEntityById(model.ProfessionalAudit, &userEntity)
|
|
|
+ if userEntity.Id > 0 {
|
|
|
+ datamap["Create2"] = userEntity.Realname
|
|
|
+ datamap["CreateDate2"] = " 年 月 日"
|
|
|
+ for _, value := range historicTasks {
|
|
|
+ if value.TaskName == "专业审批" && value.EndTime > 0 {
|
|
|
+ EndTime := time.Unix(value.EndTime / 1000, 0)
|
|
|
+ datamap["CreateDate2"] = EndTime.Format("2006年01月02日")
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 评价内容
|
|
|
+ //datamap["TableComment"] = []string{"table"}
|
|
|
+ //datamap["table"] = items
|
|
|
+
|
|
|
//datamap["TableComment"] = []string{"MajorEquipments", "ThreeYears", "Patent", "Winning"}
|
|
|
retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
|
|
|
//retDocUrl := svcActiviti.FillWordWatermarkTemplate(datamap, Url, fileName, model.SupplierName)
|
wd