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
18c8f1bc
Commit
18c8f1bc
authored
Dec 16, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d454168b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
+16
-15
OrderModule.cs
Edu.Module.Course/OrderModule.cs
+0
-1
OrderModule2.cs
Edu.Module.Course/OrderModule2.cs
+2
-2
PublicModule.cs
Edu.Module.Public/PublicModule.cs
+7
-8
FinanceController.cs
Edu.WebApi/Controllers/Finance/FinanceController.cs
+7
-4
No files found.
Edu.Module.Course/OrderModule.cs
View file @
18c8f1bc
...
...
@@ -549,7 +549,6 @@ namespace Edu.Module.Course
{
spList
=
class_StepPriceRepository
.
GetClassStepPriceListRepository
(
new
RB_Class_StepPrice_ViewModel
()
{
ClassId
=
demodel
.
ClassId
});
}
return
true
;
}
...
...
Edu.Module.Course/OrderModule2.cs
View file @
18c8f1bc
...
...
@@ -48,7 +48,7 @@ namespace Edu.Module.Course
/// <returns></returns>
public
virtual
bool
CreateBackClassApplyModule
(
int
GuestId
,
int
OrderId
,
string
reason
,
UserInfo
userinfo
,
out
string
message
)
{
bool
flag
=
false
;
bool
flag
;
message
=
""
;
var
guestModel
=
order_GuestRepository
.
GetEntity
(
GuestId
);
var
orderModel
=
orderRepository
.
GetEntity
(
OrderId
);
...
...
@@ -84,7 +84,7 @@ namespace Edu.Module.Course
})?.
FirstOrDefault
();
var
totalBackCount
=
student_BackClassRepository
.
GetStudentBackClassNumRepository
();
string
backNum
=
""
;
string
backNum
;
if
(
totalBackCount
<
10000
)
{
backNum
=
String
.
Format
(
"{0:00000}"
,
totalBackCount
);
...
...
Edu.Module.Public/PublicModule.cs
View file @
18c8f1bc
...
...
@@ -30,9 +30,8 @@ namespace Edu.Module.Public
/// <returns></returns>
public
bool
AddOrUpdateFileStore
(
RB_File_Store
model
)
{
bool
result
=
false
;
int
id
=
0
;
bool
result
;
int
id
;
if
(
model
.
ID
==
0
)
{
id
=
storeRepository
.
Insert
(
model
);
...
...
@@ -48,11 +47,11 @@ namespace Edu.Module.Public
{
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_File_Store
.
IsDefault
),
0
},
};
List
<
WhereHelper
>
whereHelpers
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
Group_Id
),
FiledValue
=
model
.
Group_Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
School_Id
),
FiledValue
=
model
.
School_Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
ID
),
FiledValue
=
id
,
OperatorEnum
=
OperatorEnum
.
NotEqual
},
};
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
Group_Id
),
FiledValue
=
model
.
Group_Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
School_Id
),
FiledValue
=
model
.
School_Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_File_Store
.
ID
),
FiledValue
=
id
,
OperatorEnum
=
OperatorEnum
.
NotEqual
},
};
storeRepository
.
Update
(
fileds
,
whereHelpers
);
}
return
result
;
...
...
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @
18c8f1bc
...
...
@@ -98,10 +98,12 @@ namespace Edu.WebApi.Controllers.Finance
var
classFinanceModel
=
classModule
.
GetClassFinanceListRepository
(
new
RB_Class_Finance_ViewModel
{
Group_Id
=
base
.
UserInfo
.
Group_Id
,
ClassId
=
classId
,
School_Id
=
schoolId
}).
FirstOrDefault
();
if
(
classFinanceModel
==
null
)
{
classFinanceModel
=
new
RB_Class_Finance_ViewModel
();
classFinanceModel
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
classFinanceModel
.
ClassId
=
classId
;
classFinanceModel
.
School_Id
=
schoolId
;
classFinanceModel
=
new
RB_Class_Finance_ViewModel
{
Group_Id
=
base
.
UserInfo
.
Group_Id
,
ClassId
=
classId
,
School_Id
=
schoolId
};
}
var
resultData
=
new
{
...
...
@@ -134,6 +136,7 @@ namespace Edu.WebApi.Controllers.Finance
/// 用户信息下载
/// </summary>
[
HttpPost
]
[
Obsolete
]
public
FileContentResult
GetClassBalanceSheetToExcel
()
{
int
classId
=
base
.
ParmJObj
.
GetInt
(
"ClassId"
,
0
);
...
...
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