Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
954e499f
Commit
954e499f
authored
Jul 13, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决现金流量表物流支出导出明细数据缺失的问题
parent
4fbbe580
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+1
-1
HomeController.cs
Bailun.DC.Web/Controllers/HomeController.cs
+2
-2
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
954e499f
...
...
@@ -7024,7 +7024,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
else
if
(
t
==
3
)
//物流
{
//物流费支出
var
listlg
=
new
Services
.
FinanceReportServices
().
ListLogisticFee
(
start
,
start
);
//new Services.FinanceReportServices().ListLogisticFee(lgurl);
var
listlg
=
new
Services
.
FinanceReportServices
().
ListLogisticFee
(
start
,
end
);
//new Services.FinanceReportServices().ListLogisticFee(lgurl);
var
colNames
=
new
List
<
string
>()
{
"单号"
,
"被出纳公司名"
,
"出纳时间"
,
"类型"
,
"部门"
,
"付款主体"
,
"费用主类型"
,
"金额"
};
...
...
Bailun.DC.Web/Controllers/HomeController.cs
View file @
954e499f
...
...
@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
public
ActionResult
Main
()
{
#if DEBUG
var
cookie
=
"Bearer
eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ0MzIxODcsImV4cCI6MTU5NDQ2ODE4NywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0NDMyMTg3LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.F55raFhd4ISWtce2zThklDMazzbjjvxvEDFdWOadT4apAT7DeLxGmzw0juwgMnq1f51N9O502lShZvVp0lauvhIc0rEczGk3StQbAtotAIgUc6a0X7OE6JCdVSGdhlDT0n3388Lemsn5buFfgezfnLrSVD6Ry_eA6LFsQyjihhWYlpNI_NT-7OfV6W2bpUMBQga-F1IWJdV6ic8EDOvWOhQKns31duBAAYsVsfZOfDZfQqh7qAiuDXesyyPj9kWfokOc14Hx1WdNcZpTbVs6FN86g8wHystmxH-jucP294ffJgiBX08qc-b2jc8uvNKrXgkh6872AMqnE1uoADlL6g
"
;
var
cookie
=
"Bearer
%20eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ2MDY1OTMsImV4cCI6MTU5NDY0MjU5MywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0NjA2NTkzLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.pyRMxoO3G_NDtjFaaJbQj00bU8LS8egnmZZB3WdN1Hbl-wut_flVvFIFIUPyMqbbGnuI26RLU3Q-kldo8gfiKtdHKUaHkPTmlDprKLS9P0kqX2yGFn6QwHTvuSYgmB-MtZPhtYA4vNiyM9_wv_BZauPcuzMeh6W9NAQaQtZ9OLXJuq-htoj2J_SGeBV9mKWbGere7F-6rVwgBCL3WOW_DWbEwKJesZC02upHo2v50GO21k2YSFrJAlBZyanS2QQzaTG2gdQKjchrnJNqlWLxKRVoM3dRUbaMfay4lEWUCuec_kf2mumYcloXgu6BSv403rx3oSjhAG_pUx511BYrjA
"
;
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var
cookie
=
HttpContext
.
Request
.
Cookies
[
"BailunToken"
];
...
...
@@ -72,7 +72,7 @@ namespace Bailun.DC.Web.Controllers
var
user
=
Common
.
HttpHelper
.
NetHelper
.
Request
(
"http://sso.bailuntec.com/GetUserResource"
,
new
string
[]
{
"Authorization"
},
new
string
[]
{
(
cookie
!=
null
?
cookie
:
""
)});
var
user
=
Common
.
HttpHelper
.
NetHelper
.
Request
(
"http://sso.bailuntec.com/GetUserResource"
,
new
string
[]
{
"Authorization"
},
new
string
[]
{
(
cookie
!=
null
?
System
.
Net
.
WebUtility
.
UrlDecode
(
cookie
)
:
""
)});
var
json
=
Newtonsoft
.
Json
.
Linq
.
JObject
.
Parse
(
user
);
if
(
json
[
"statusCode"
].
ToStr
()
==
"200"
&&
json
[
"result"
][
"success"
].
ToString
().
ToLower
()
==
"true"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment