浏览代码

承包商评价导出bug

wd 4 年之前
父节点
当前提交
13d71774cb
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

+ 7 - 3
src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -463,9 +463,13 @@ func (this *OilContractReviewController) DocExport() {
 		}
 
 		datamap["ContractPeriod"] = contractModel.ContractPeriod
-		datamap["OpenDate"] = contractModel.OpenDate.Format("2006年01月02日")
-		datamap["PlanFinishDate"] = contractModel.PlanFinishDate.Format("2006年01月02日")
-		datamap["ConstructionUnit"] = contractModel.ConstructionUnit
+		datamap["OpenDate"] = contractModel.StartDate.Format("2006年01月02日")
+		datamap["PlanFinishDate"] = contractModel.EndDate.Format("2006年01月02日")
+		if contractModel.SecondUnitName != "" {
+			datamap["ConstructionUnit"] = contractModel.SecondUnitName
+		} else {
+			datamap["ConstructionUnit"] = contractModel.ConstructionUnit
+		}
 		datamap["ConstructionOwner"] = contractModel.ConstructionOwner
 		datamap["ConstructionTelphone"] = contractModel.ConstructionTelphone
 	}