Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
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
黄奎
Education
Commits
952e5425
Commit
952e5425
authored
Mar 19, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
定时器调整
parent
e776329b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
appsettings.json
Edu.EducationCore/appsettings.json
+1
-1
FinanceModule.cs
Edu.Module.Finance/FinanceModule.cs
+1
-1
No files found.
Edu.EducationCore/appsettings.json
View file @
952e5425
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
//
"FinanceConnection"
:
"server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
//
"FinanceConnection"
:
"server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
//
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
,
//
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
,
//
"DataStatisticsConnection"
:
"server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
//
"DataStatisticsConnection"
:
"server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
//
"DataStatisticsConnectionPName"
:
"MySql.Data.MySqlClient"
,
//
"DataStatisticsConnectionPName"
:
"MySql.Data.MySqlClient"
"DefaultConnection"
:
"server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;user id=reborn;password=Reborn@2018;database=uat_reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnection"
:
"server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;user id=reborn;password=Reborn@2018;database=uat_reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;user id=reborn;password=Reborn@2018;database=uat_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"FinanceConnection"
:
"server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;user id=reborn;password=Reborn@2018;database=uat_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
...
...
Edu.Module.Finance/FinanceModule.cs
View file @
952e5425
...
@@ -469,7 +469,7 @@ namespace Edu.Module.Finance
...
@@ -469,7 +469,7 @@ namespace Edu.Module.Finance
var
FYLXList
=
new
List
<
string
>(
FYLX
.
Split
(
new
string
[]
{
","
},
StringSplitOptions
.
RemoveEmptyEntries
));
var
FYLXList
=
new
List
<
string
>(
FYLX
.
Split
(
new
string
[]
{
","
},
StringSplitOptions
.
RemoveEmptyEntries
));
var
RZFYLXList
=
new
List
<
string
>(
RZFYLX
.
Split
(
new
string
[]
{
","
},
StringSplitOptions
.
RemoveEmptyEntries
));
var
RZFYLXList
=
new
List
<
string
>(
RZFYLX
.
Split
(
new
string
[]
{
","
},
StringSplitOptions
.
RemoveEmptyEntries
));
//财务单据
//财务单据
var
RZFinancelist
=
RB_FinanceRepository
.
GetListForReport
(
new
RB_Finance_Extend
()
{
sAduitDate
=
DateTime
.
Parse
(
sDate
),
eAduitDate
=
DateTime
.
Now
.
AddYears
(
1
).
AddDays
(-
1
),
RB_Branch_Id
=
-
1
,
RB_Group_Id
=
GroupId
,
Is_TCID
=
1
});
var
RZFinancelist
=
RB_FinanceRepository
.
GetListForReport
(
new
RB_Finance_Extend
()
{
sAduitDate
=
DateTime
.
Parse
(
sDate
),
eAduitDate
=
DateTime
.
Now
.
AddYears
(
1
).
AddDays
(-
1
),
RB_Branch_Id
=
-
1
,
RB_Group_Id
=
GroupId
,
Is_TCID
=
1
,
TCID
=
-
1
});
//获取资金调拨单据
//获取资金调拨单据
var
CapitalAllocationFinanceList
=
RB_FinanceRepository
.
GetTradeWayForCapitalAllocation
(
new
RB_Finance_Extend
()
{
sAduitDate
=
DateTime
.
Parse
(
sDate
),
eAduitDate
=
DateTime
.
Now
.
AddYears
(
1
).
AddDays
(-
1
),
RB_Branch_Id
=
-
1
,
RB_Group_Id
=
GroupId
,
Is_TCID
=
1
,
TCID
=
-
1
});
var
CapitalAllocationFinanceList
=
RB_FinanceRepository
.
GetTradeWayForCapitalAllocation
(
new
RB_Finance_Extend
()
{
sAduitDate
=
DateTime
.
Parse
(
sDate
),
eAduitDate
=
DateTime
.
Now
.
AddYears
(
1
).
AddDays
(-
1
),
RB_Branch_Id
=
-
1
,
RB_Group_Id
=
GroupId
,
Is_TCID
=
1
,
TCID
=
-
1
});
//营收报表数据
//营收报表数据
...
...
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