golang/hotime
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 85 Wiki Activity

政企超链接开始集成

Browse Source
This commit is contained in:
hoteas
2022-03-04 00:06:04 +08:00
parent cac0214271
commit 6512f122f5
3 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/admin/companyinout.go
+3 -3
View File
@@ -483,10 +483,10 @@ func decodeData2Sql(table [][]string, this *Context, orgId int) error {
companyData["industry_id"] = industry.GetCeilInt("id")
}
company := this.Db.Get("company", "id", Map{"sn": companyData["sn"]})
company := this.Db.Get("company", "id", Map{"name": companyData["name"]})
//没有则创建
if company == nil {
company = this.Db.Get("company", "id", Map{"name": companyData["name"]})
if company == nil && companyData.GetString("sn") != "暂无" {
company = this.Db.Get("company", "id", Map{"sn": companyData["sn"]})
}
//没有则创建
example/admin/org4.go
+26 -7
View File
@@ -495,9 +495,16 @@ func ctgAnalyse(datas []Map, totalAnalyse Map) Map {
}
resTotal["区域经营收入"] = resTotal.GetFloat64("区域经营收入") + uploadData.GetFloat64("IEDC2NYYSR")
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + +uploadData.GetFloat64("IEDCYNSJ") +
uploadData.GetFloat64("IEDC2NYJSJ") + uploadData.GetFloat64("IEDCNSZE") +
uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
if uploadData.GetFloat64("IEDCYNSJ") != 0 {
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDCYNSJ")
} else {
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDC2NYJSJ") +
uploadData.GetFloat64("IEDCNSZE") +
uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
}
//resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + +uploadData.GetFloat64("IEDCYNSJ") +
// uploadData.GetFloat64("IEDC2NYJSJ") + uploadData.GetFloat64("IEDCNSZE") +
// uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
resTotal["区域资产总额"] = resTotal.GetFloat64("区域资产总额") + uploadData.GetFloat64("IEDCZCZE")
resTotal["独角兽企业数"] = resTotal.GetInt("独角兽企业数") + uploadData.GetInt("IEDCDJSQY") +
@@ -778,9 +785,13 @@ func totalAnalyse(datas []Map) (Map, Map, Map, Map) {
}
resTotal["区域经营收入"] = resTotal.GetFloat64("区域经营收入") + uploadData.GetFloat64("IEDC2NYYSR")
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDCYNSJ") +
uploadData.GetFloat64("IEDC2NYJSJ") + uploadData.GetFloat64("IEDCNSZE") +
uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
if uploadData.GetFloat64("IEDCYNSJ") != 0 {
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDCYNSJ")
} else {
resTotal["区域纳税总值"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDC2NYJSJ") +
uploadData.GetFloat64("IEDCNSZE") +
uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
}
resTotal["区域资产总额"] = resTotal.GetFloat64("区域资产总额") + uploadData.GetFloat64("IEDCZCZE")
@@ -923,7 +934,15 @@ func totalAnalyse(datas []Map) (Map, Map, Map, Map) {
//6
resTotal[level+"类企业营业收入"] = resTotal.GetFloat64(level+"类企业营业收入") + uploadData.GetFloat64("IEDC2NYYSR") + uploadData.GetFloat64("IEDCYYSR")
resTotal[level+"类企业税收"] = resTotal.GetFloat64(level+"类企业税收") + uploadData.GetFloat64("IEDCYNSJ") + uploadData.GetFloat64("IEDCYJSJ")
//resTotal[level+"类企业税收"] = resTotal.GetFloat64(level+"类企业税收") +
// uploadData.GetFloat64("IEDCYNSJ") + uploadData.GetFloat64("IEDCYJSJ")
if uploadData.GetFloat64("IEDCYNSJ") != 0 {
resTotal[level+"类企业税收"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDCYNSJ")
} else {
resTotal[level+"类企业税收"] = resTotal.GetFloat64("区域纳税总值") + uploadData.GetFloat64("IEDC2NYJSJ") +
uploadData.GetFloat64("IEDCNSZE") +
uploadData.GetFloat64("IEDC2NSJSJ") + uploadData.GetFloat64("IEDCYJSJ")
}
resTotal[level+"类企业占地面积"] = resTotal.GetFloat64(level+"类企业占地面积") + uploadData.GetFloat64("IEDCYDMJ") +
uploadData.GetFloat64("IEDCZDMJ")
resTotal[level+"类企业社保人数"] = resTotal.GetInt(level+"类企业社保人数") + uploadData.GetInt("IEDCSBRS")