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
ba3c6f3d
Commit
ba3c6f3d
authored
Nov 11, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决管理成本无法查看4千里明细的问题
parent
b3c4f55c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
FinanceReportServices.cs
Bailun.DC.Services/FinanceReportServices.cs
+10
-1
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+2
-1
No files found.
Bailun.DC.Services/FinanceReportServices.cs
View file @
ba3c6f3d
...
@@ -712,10 +712,19 @@ namespace Bailun.DC.Services
...
@@ -712,10 +712,19 @@ namespace Bailun.DC.Services
if
(!
string
.
IsNullOrEmpty
(
departmentname
))
if
(!
string
.
IsNullOrEmpty
(
departmentname
))
{
{
if
(
departmentname
==
"四千里主体"
)
{
//72, 67, 58, 54, 78
sql
+=
" and company_value in (72, 67, 58, 54, 78)"
;
}
else
{
sql
+=
" and department_name=@department_name"
;
sql
+=
" and department_name=@department_name"
;
sqlparam
.
Add
(
"department_name"
,
departmentname
);
sqlparam
.
Add
(
"department_name"
,
departmentname
);
}
}
}
if
(
paycompanyid
.
HasValue
&&
paycompanyid
.
Value
>
0
)
if
(
paycompanyid
.
HasValue
&&
paycompanyid
.
Value
>
0
)
{
{
...
@@ -731,9 +740,9 @@ namespace Bailun.DC.Services
...
@@ -731,9 +740,9 @@ namespace Bailun.DC.Services
{
{
sql
+=
" and company_value="
+
paycompanyid
.
Value
;
sql
+=
" and company_value="
+
paycompanyid
.
Value
;
}
}
}
}
using
(
var
cn
=
new
MySqlConnection
(
Common
.
GlobalConfig
.
ConnectionString
))
using
(
var
cn
=
new
MySqlConnection
(
Common
.
GlobalConfig
.
ConnectionString
))
{
{
...
...
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
ba3c6f3d
...
@@ -628,7 +628,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -628,7 +628,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if
(
list
.
Count
>
0
)
if
(
list
.
Count
>
0
)
{
{
var
list4K
=
new
List
<
int
>()
{
72
,
67
,
58
,
54
};
var
list4K
=
new
List
<
int
>()
{
72
,
67
,
58
,
54
,
78
};
if
(
t
==
2
)
//按付款主体
if
(
t
==
2
)
//按付款主体
{
{
listCol
=
list
.
GroupBy
(
a
=>
a
.
company_name
).
Select
(
p
=>
p
.
Key
).
OrderBy
(
a
=>
a
).
ToList
();
listCol
=
list
.
GroupBy
(
a
=>
a
.
company_name
).
Select
(
p
=>
p
.
Key
).
OrderBy
(
a
=>
a
).
ToList
();
...
@@ -641,6 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -641,6 +641,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listCol
.
Remove
(
"深圳市四千里数据科技有限公司"
);
listCol
.
Remove
(
"深圳市四千里数据科技有限公司"
);
listCol
.
Remove
(
"4Kmiles tec Limited"
);
listCol
.
Remove
(
"4Kmiles tec Limited"
);
listCol
.
Remove
(
"广州四千里数据科技有限公司"
);
listCol
.
Remove
(
"广州四千里数据科技有限公司"
);
listCol
.
Remove
(
"(英国)4kmiles technologies ltd"
);
listCol
.
Add
(
"四千里主体"
);
listCol
.
Add
(
"四千里主体"
);
}
}
...
...
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