|
|
@@ -62,14 +62,15 @@ func (this *SupplierDataEntryController) DocExport() {
|
|
|
certId := this.GetString("CertId")
|
|
|
var Url string
|
|
|
var fileName string
|
|
|
+ var currencyType string
|
|
|
svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
var model1 supplierdataentry.SupplierDataEntry
|
|
|
var model2 supplierdataentry.SupplierCertDataEntry
|
|
|
-
|
|
|
svc := supplierdataentry.GetSupplierDataEntryService(utils.DBE)
|
|
|
where1 := "1=1"
|
|
|
where1 += " AND Id = '" + Id + "'"
|
|
|
where2 := "Id = '" + certId + "'"
|
|
|
+
|
|
|
svc.GetEntityByWhere(OilSupplierName, where1, &model1)
|
|
|
svc.GetEntityByWhere(OilSupplierCertName, where2, &model2)
|
|
|
|
|
|
@@ -169,7 +170,19 @@ func (this *SupplierDataEntryController) DocExport() {
|
|
|
//datamap["LegalPerson"] = model1.LegalPerson
|
|
|
//datamap["CompanyType"] = model1.CompanyType
|
|
|
//datamap["ContactName"] = model1.ContactName
|
|
|
- //datamap["RegCapital"] = model1.RegCapital
|
|
|
+
|
|
|
+ if model1.Currency == "CNY" || model1.Currency == "人民币元"{
|
|
|
+ currencyType = "人民币"
|
|
|
+ }else if model1.Currency == "USD" {
|
|
|
+ currencyType ="美元"
|
|
|
+ }else if model1.Currency == "EUR" {
|
|
|
+ currencyType = "欧元"
|
|
|
+ }else if model1.Currency=="JPY"{
|
|
|
+ currencyType = "日元"
|
|
|
+ }else if model1.Currency == ""{
|
|
|
+ currencyType="万元"
|
|
|
+ }
|
|
|
+ datamap["RegCapital"] = strconv.FormatFloat(model1.RegCapital,'f',0,64)+"万元"+currencyType
|
|
|
//datamap["DepositBank"] = model1.DepositBank
|
|
|
//datamap["BankAccount"] = model1.BankAccount
|
|
|
//datamap["Mobile"] = model1.Mobile
|
|
|
@@ -412,7 +425,7 @@ func (this *SupplierDataEntryController) PdfExport() {
|
|
|
datamap["LegalPerson"] = model1.LegalPerson
|
|
|
datamap["CompanyType"] = model1.CompanyType
|
|
|
datamap["ContactName"] = model1.ContactName
|
|
|
- datamap["RegCapital"] = model1.RegCapital
|
|
|
+ datamap["RegCapital"] = strconv.FormatFloat(model1.RegCapital,'f',2,64)+"万元"+model1.Currency
|
|
|
datamap["DepositBank"] = model1.DepositBank
|
|
|
datamap["BankAccount"] = model1.BankAccount
|
|
|
datamap["Mobile"] = model1.Mobile
|